custom type boolean => bool

This commit is contained in:
Gwenhael Le Moine 2023-10-03 14:06:40 +02:00
parent 8000231f19
commit 866d373538
No known key found for this signature in database
GPG key ID: FDFE3669426707A7
18 changed files with 111 additions and 112 deletions

View file

@ -22,21 +22,21 @@ typedef struct {
address ce2_base;
address nce3_size;
address nce3_base;
boolean hdw_cfg : 1;
boolean ram_sz_cfg : 1;
boolean ram_cfg : 1;
boolean ce1_sz_cfg : 1;
boolean ce1_cfg : 1;
boolean ce2_sz_cfg : 1;
boolean ce2_cfg : 1;
boolean nce3_sz_cfg : 1;
boolean nce3_cfg : 1;
boolean ce1_r_o : 1;
boolean ce2_r_o : 1;
boolean nce3_r_o : 1;
boolean ce1_bs : 1;
boolean da19 : 1;
boolean ben : 1;
bool hdw_cfg : 1;
bool ram_sz_cfg : 1;
bool ram_cfg : 1;
bool ce1_sz_cfg : 1;
bool ce1_cfg : 1;
bool ce2_sz_cfg : 1;
bool ce2_cfg : 1;
bool nce3_sz_cfg : 1;
bool nce3_cfg : 1;
bool ce1_r_o : 1;
bool ce2_r_o : 1;
bool nce3_r_o : 1;
bool ce1_bs : 1;
bool da19 : 1;
bool ben : 1;
byte* rom_data;
byte* ram_data;
byte* ce1_data;

View file

@ -15,12 +15,12 @@ typedef struct {
address pc;
address rstk[ 8 ];
int rstk_ptr;
boolean carry : 1;
boolean dec : 1;
boolean shutdown : 1;
boolean inte : 1;
boolean keyscan : 1;
boolean keyintp : 1;
bool carry : 1;
bool dec : 1;
bool shutdown : 1;
bool inte : 1;
bool keyscan : 1;
bool keyintp : 1;
dword cycles;
dword inst_cnt;
} Cpu;

View file

@ -14,7 +14,7 @@ address display_line_offset;
byte display_line_count;
byte display_height;
byte display_offset;
boolean display_enable;
bool display_enable;
byte lcdScreen[ 131 * 64 ];
byte prev_lcdScreen[ 131 * 64 ];
@ -23,14 +23,14 @@ byte prev2_lcdScreen[ 131 * 64 ];
byte lcdScreenGS[ 131 * 64 ];
static address cur_adr;
static boolean in_menu;
static bool in_menu;
static byte off_cur_line;
static byte off_line;
static int off_cnt;
/* static boolean shouldClear = true; */
static boolean shouldRender = false;
/* static bool shouldClear = true; */
static bool shouldRender = false;
static int screen_draw_count = 0;
static boolean drawGS = false;
static bool drawGS = false;
extern SDL_Renderer* renderer;
extern SDL_Window* window;

View file

@ -11,7 +11,7 @@ extern address display_line_offset;
extern byte display_line_count;
extern byte display_height;
extern byte display_offset;
extern boolean display_enable;
extern bool display_enable;
void display_init( void );
void display_exit( void );

View file

@ -25,7 +25,7 @@ typedef struct {
typedef struct {
volatile int value;
int speed;
boolean running;
bool running;
void ( *proc )( void );
} TimerEvent;
@ -47,7 +47,7 @@ static TimerEvent timer_events[] = {
{ 0, 0, false, NULL }
};
volatile boolean please_exit = false;
volatile bool please_exit = false;
dword emulator_speed = 4000000;
static int emulator_state = EMULATOR_RUN; // EMULATOR_STOP;
@ -111,7 +111,7 @@ int emulator_get_state( void ) { return emulator_state; }
void emulator_init( void )
{
static boolean locked = false;
static bool locked = false;
bus_init();
display_init();
@ -129,13 +129,13 @@ void emulator_exit( void )
bus_exit();
}
boolean emulator_run( void )
bool emulator_run( void )
{
CycleEvent* cep;
TimerEvent* tep;
dword delta;
static boolean first_run = false;
static bool first_run = false;
if ( first_run == false && emulator_state == EMULATOR_RUN ) {
first_run = true;
start_timer_proc( gui_update );

View file

@ -7,12 +7,12 @@ enum EmulatorStates { EMULATOR_STOP, EMULATOR_STEP, EMULATOR_RUN };
void true_speed_proc( void );
extern volatile boolean please_exit;
extern volatile bool please_exit;
extern dword emulator_speed;
void emulator_init( void );
void emulator_exit( void );
boolean emulator_run( void );
bool emulator_run( void );
void emulator_set_state( int state );
int emulator_get_state( void );

View file

@ -17,7 +17,7 @@ typedef struct {
char* textC;
char* textD;
void ( *down )( void );
void ( *up )( boolean action );
void ( *up )( bool action );
} Button;
/* Button flags:

View file

@ -2,7 +2,7 @@
#include "cpu.h"
#include "keyboard.h"
boolean kbd_on;
bool kbd_on;
static byte kbd_row[ 9 ];
@ -41,7 +41,7 @@ void kbd_out_changed( void ) { update_in(); }
void kbd_key_pressed( int row, int col )
{
boolean no_key = !cpu.in[ 0 ] && !cpu.in[ 1 ] && !cpu.in[ 3 ];
bool no_key = !cpu.in[ 0 ] && !cpu.in[ 1 ] && !cpu.in[ 3 ];
kbd_row[ row ] |= 1 << col;
update_in();
if ( cpu.shutdown && no_key && ( cpu.in[ 0 ] || cpu.in[ 1 ] || cpu.in[ 3 ] ) ) {
@ -70,7 +70,7 @@ void kbd_key_released( int row, int col )
void kbd_on_pressed( void )
{
boolean no_key = !cpu.in[ 3 ];
bool no_key = !cpu.in[ 3 ];
kbd_on = true;
cpu.in[ 3 ] |= 8;
if ( cpu.shutdown && no_key ) {

View file

@ -3,7 +3,7 @@
#include "types.h"
extern boolean kbd_on;
extern bool kbd_on;
void kbd_out_changed( void );
void kbd_key_pressed( int row, int col );

View file

@ -34,7 +34,7 @@ SDL_TimerID my_timer2_id;
SDL_TimerID my_timer3_id;
SDL_TimerID my_timer4_id;
boolean SDL_ready = false;
bool SDL_ready = false;
unsigned int framecount = 0;
unsigned int emuframecount = 0;
@ -261,7 +261,7 @@ static void program_exit( void )
SDL_Quit();
}
boolean refreshSDL()
bool refreshSDL()
{
SDL_Event event;
// SDL_WaitEvent(&event);

View file

@ -7,107 +7,107 @@
#include "pfiles.h"
static void dn00( void ) { kbd_key_pressed( 0, 0 ); }
static void up00( boolean action ) { kbd_key_released( 0, 0 ); }
static void up00( bool action ) { kbd_key_released( 0, 0 ); }
static void dn01( void ) { kbd_key_pressed( 0, 1 ); }
static void up01( boolean action ) { kbd_key_released( 0, 1 ); }
static void up01( bool action ) { kbd_key_released( 0, 1 ); }
static void dn02( void ) { kbd_key_pressed( 0, 2 ); }
static void up02( boolean action ) { kbd_key_released( 0, 2 ); }
static void up02( bool action ) { kbd_key_released( 0, 2 ); }
static void dn03( void ) { kbd_key_pressed( 0, 3 ); }
static void up03( boolean action ) { kbd_key_released( 0, 3 ); }
static void up03( bool action ) { kbd_key_released( 0, 3 ); }
static void dn04( void ) { kbd_key_pressed( 0, 4 ); }
static void up04( boolean action ) { kbd_key_released( 0, 4 ); }
static void up04( bool action ) { kbd_key_released( 0, 4 ); }
static void dn10( void ) { kbd_key_pressed( 1, 0 ); }
static void up10( boolean action ) { kbd_key_released( 1, 0 ); }
static void up10( bool action ) { kbd_key_released( 1, 0 ); }
static void dn11( void ) { kbd_key_pressed( 1, 1 ); }
static void up11( boolean action ) { kbd_key_released( 1, 1 ); }
static void up11( bool action ) { kbd_key_released( 1, 1 ); }
static void dn12( void ) { kbd_key_pressed( 1, 2 ); }
static void up12( boolean action ) { kbd_key_released( 1, 2 ); }
static void up12( bool action ) { kbd_key_released( 1, 2 ); }
static void dn13( void ) { kbd_key_pressed( 1, 3 ); }
static void up13( boolean action ) { kbd_key_released( 1, 3 ); }
static void up13( bool action ) { kbd_key_released( 1, 3 ); }
static void dn14( void ) { kbd_key_pressed( 1, 4 ); }
static void up14( boolean action ) { kbd_key_released( 1, 4 ); }
static void up14( bool action ) { kbd_key_released( 1, 4 ); }
static void dn15( void ) { kbd_key_pressed( 1, 5 ); }
static void up15( boolean action ) { kbd_key_released( 1, 5 ); }
static void up15( bool action ) { kbd_key_released( 1, 5 ); }
static void dn20( void ) { kbd_key_pressed( 2, 0 ); }
static void up20( boolean action ) { kbd_key_released( 2, 0 ); }
static void up20( bool action ) { kbd_key_released( 2, 0 ); }
static void dn21( void ) { kbd_key_pressed( 2, 1 ); }
static void up21( boolean action ) { kbd_key_released( 2, 1 ); }
static void up21( bool action ) { kbd_key_released( 2, 1 ); }
static void dn22( void ) { kbd_key_pressed( 2, 2 ); }
static void up22( boolean action ) { kbd_key_released( 2, 2 ); }
static void up22( bool action ) { kbd_key_released( 2, 2 ); }
static void dn23( void ) { kbd_key_pressed( 2, 3 ); }
static void up23( boolean action ) { kbd_key_released( 2, 3 ); }
static void up23( bool action ) { kbd_key_released( 2, 3 ); }
static void dn24( void ) { kbd_key_pressed( 2, 4 ); }
static void up24( boolean action ) { kbd_key_released( 2, 4 ); }
static void up24( bool action ) { kbd_key_released( 2, 4 ); }
static void dn25( void ) { kbd_key_pressed( 2, 5 ); }
static void up25( boolean action ) { kbd_key_released( 2, 5 ); }
static void up25( bool action ) { kbd_key_released( 2, 5 ); }
static void dn30( void ) { kbd_key_pressed( 3, 0 ); }
static void up30( boolean action ) { kbd_key_released( 3, 0 ); }
static void up30( bool action ) { kbd_key_released( 3, 0 ); }
static void dn31( void ) { kbd_key_pressed( 3, 1 ); }
static void up31( boolean action ) { kbd_key_released( 3, 1 ); }
static void up31( bool action ) { kbd_key_released( 3, 1 ); }
static void dn32( void ) { kbd_key_pressed( 3, 2 ); }
static void up32( boolean action ) { kbd_key_released( 3, 2 ); }
static void up32( bool action ) { kbd_key_released( 3, 2 ); }
static void dn33( void ) { kbd_key_pressed( 3, 3 ); }
static void up33( boolean action ) { kbd_key_released( 3, 3 ); }
static void up33( bool action ) { kbd_key_released( 3, 3 ); }
static void dn34( void ) { kbd_key_pressed( 3, 4 ); }
static void up34( boolean action ) { kbd_key_released( 3, 4 ); }
static void up34( bool action ) { kbd_key_released( 3, 4 ); }
static void dn35( void ) { kbd_key_pressed( 3, 5 ); }
static void up35( boolean action ) { kbd_key_released( 3, 5 ); }
static void up35( bool action ) { kbd_key_released( 3, 5 ); }
static void dn40( void ) { kbd_key_pressed( 4, 0 ); }
static void up40( boolean action ) { kbd_key_released( 4, 0 ); }
static void up40( bool action ) { kbd_key_released( 4, 0 ); }
static void dn41( void ) { kbd_key_pressed( 4, 1 ); }
static void up41( boolean action ) { kbd_key_released( 4, 1 ); }
static void up41( bool action ) { kbd_key_released( 4, 1 ); }
static void dn42( void ) { kbd_key_pressed( 4, 2 ); }
static void up42( boolean action ) { kbd_key_released( 4, 2 ); }
static void up42( bool action ) { kbd_key_released( 4, 2 ); }
static void dn43( void ) { kbd_key_pressed( 4, 3 ); }
static void up43( boolean action ) { kbd_key_released( 4, 3 ); }
static void up43( bool action ) { kbd_key_released( 4, 3 ); }
static void dn44( void ) { kbd_key_pressed( 4, 4 ); }
static void up44( boolean action ) { kbd_key_released( 4, 4 ); }
static void up44( bool action ) { kbd_key_released( 4, 4 ); }
static void dn50( void ) { kbd_key_pressed( 5, 0 ); }
static void up50( boolean action ) { kbd_key_released( 5, 0 ); }
static void up50( bool action ) { kbd_key_released( 5, 0 ); }
static void dn51( void ) { kbd_key_pressed( 5, 1 ); }
static void up51( boolean action ) { kbd_key_released( 5, 1 ); }
static void up51( bool action ) { kbd_key_released( 5, 1 ); }
static void dn52( void ) { kbd_key_pressed( 5, 2 ); }
static void up52( boolean action ) { kbd_key_released( 5, 2 ); }
static void up52( bool action ) { kbd_key_released( 5, 2 ); }
static void dn53( void ) { kbd_key_pressed( 5, 3 ); }
static void up53( boolean action ) { kbd_key_released( 5, 3 ); }
static void up53( bool action ) { kbd_key_released( 5, 3 ); }
static void dn54( void ) { kbd_key_pressed( 5, 4 ); }
static void up54( boolean action ) { kbd_key_released( 5, 4 ); }
static void up54( bool action ) { kbd_key_released( 5, 4 ); }
static void dn60( void ) { kbd_key_pressed( 6, 0 ); }
static void up60( boolean action ) { kbd_key_released( 6, 0 ); }
static void up60( bool action ) { kbd_key_released( 6, 0 ); }
static void dn61( void ) { kbd_key_pressed( 6, 1 ); }
static void up61( boolean action ) { kbd_key_released( 6, 1 ); }
static void up61( bool action ) { kbd_key_released( 6, 1 ); }
static void dn62( void ) { kbd_key_pressed( 6, 2 ); }
static void up62( boolean action ) { kbd_key_released( 6, 2 ); }
static void up62( bool action ) { kbd_key_released( 6, 2 ); }
static void dn63( void ) { kbd_key_pressed( 6, 3 ); }
static void up63( boolean action ) { kbd_key_released( 6, 3 ); }
static void up63( bool action ) { kbd_key_released( 6, 3 ); }
static void dn64( void ) { kbd_key_pressed( 6, 4 ); }
static void up64( boolean action ) { kbd_key_released( 6, 4 ); }
static void up64( bool action ) { kbd_key_released( 6, 4 ); }
static void dn70( void ) { kbd_key_pressed( 7, 0 ); }
static void up70( boolean action ) { kbd_key_released( 7, 0 ); }
static void up70( bool action ) { kbd_key_released( 7, 0 ); }
static void dn71( void ) { kbd_key_pressed( 7, 1 ); }
static void up71( boolean action ) { kbd_key_released( 7, 1 ); }
static void up71( bool action ) { kbd_key_released( 7, 1 ); }
static void dn72( void ) { kbd_key_pressed( 7, 2 ); }
static void up72( boolean action ) { kbd_key_released( 7, 2 ); }
static void up72( bool action ) { kbd_key_released( 7, 2 ); }
static void dn73( void ) { kbd_key_pressed( 7, 3 ); }
static void up73( boolean action ) { kbd_key_released( 7, 3 ); }
static void up73( bool action ) { kbd_key_released( 7, 3 ); }
static void dn74( void ) { kbd_key_pressed( 7, 4 ); }
static void up74( boolean action ) { kbd_key_released( 7, 4 ); }
static void up74( bool action ) { kbd_key_released( 7, 4 ); }
static void dn80( void ) { kbd_key_pressed( 8, 0 ); }
static void up80( boolean action ) { kbd_key_released( 8, 0 ); }
static void up80( bool action ) { kbd_key_released( 8, 0 ); }
static void dn81( void ) { kbd_key_pressed( 8, 1 ); }
static void up81( boolean action ) { kbd_key_released( 8, 1 ); }
static void up81( bool action ) { kbd_key_released( 8, 1 ); }
static void dn82( void ) { kbd_key_pressed( 8, 2 ); }
static void up82( boolean action ) { kbd_key_released( 8, 2 ); }
static void up82( bool action ) { kbd_key_released( 8, 2 ); }
static void dn83( void ) { kbd_key_pressed( 8, 3 ); }
static void up83( boolean action ) { kbd_key_released( 8, 3 ); }
static void up83( bool action ) { kbd_key_released( 8, 3 ); }
static void dn84( void ) { kbd_key_pressed( 8, 4 ); }
static void up84( boolean action ) { kbd_key_released( 8, 4 ); }
static void up84( bool action ) { kbd_key_released( 8, 4 ); }
static void dnON( void ) { kbd_on_pressed(); }
static void upON( boolean action ) { kbd_on_released(); }
static void upON( bool action ) { kbd_on_released(); }
static void dnZelda( void ) {}
static void upZelda( boolean action ) { load_file( "zeldahp.dir" ); }
// static void upZelda(boolean action) { load_file("Arkalite.lib"); }
static void upZelda( bool action ) { load_file( "zeldahp.dir" ); }
// static void upZelda(bool action) { load_file("Arkalite.lib"); }
const int pox = 2;
const int poy = 55;

View file

@ -7,7 +7,7 @@
typedef struct {
SDL_Keycode SDL_event_id;
void ( *down )( void );
void ( *up )( boolean action );
void ( *up )( bool action );
} KBMapping;
void pcalc_init();

View file

@ -9,9 +9,9 @@
#include "gui.h"
#include "pdebug.h"
/* static void run_up( boolean action ); */
/* static void break_up( boolean action ); */
/* static void step_up( boolean action ); */
/* static void run_up( bool action ); */
/* static void break_up( bool action ); */
/* static void step_up( bool action ); */
/* static Button debug_buttons[] = { */
/* {0, 0, 0, 79, 20, BUTTON_B1RELEASE, "Break", NULL, NULL, NULL, break_up, NULL}, */
@ -58,21 +58,21 @@ if (emulator_get_state() == EMULATOR_STOP) {
}*/
}
/* static void run_up( boolean action ) */
/* static void run_up( bool action ) */
/* { */
/* if ( action ) { */
/* emulator_set_state( EMULATOR_RUN ); */
/* } */
/* } */
/* static void break_up( boolean action ) */
/* static void break_up( bool action ) */
/* { */
/* if ( action ) { */
/* emulator_set_state( EMULATOR_STOP ); */
/* } */
/* } */
/* static void step_up( boolean action ) */
/* static void step_up( bool action ) */
/* { */
/* if ( action ) { */
/* emulator_set_state( EMULATOR_STEP ); */

View file

@ -24,7 +24,7 @@
# include <linux/limits.h> // PATH_MAX
#endif
// static void load_up(boolean action);
// static void load_up(bool action);
/*
static Button files_buttons[] = {
@ -194,7 +194,7 @@ void load_file( char* name )
// /Users/admin/Documents/GIT/jsEmu48/jsEmu48/emutest2/emutest2/arkalite
// static
void load_up( boolean action )
void load_up( bool action )
{
/* static char path[ PATH_SIZE ] = ""; */

View file

@ -3,7 +3,7 @@
#include "types.h"
void load_up( boolean action );
void load_up( bool action );
void load_file( char* name );
void pfiles_hide( void );
void pfiles_down( int mx, int my, int mb );

View file

@ -4,10 +4,10 @@
#include "gui.h"
#include "pmenu.h"
/* static void exit_up( boolean action ); */
/* static void debug_up( boolean action ); */
/* static void files_up( boolean action ); */
/* static void about_up( boolean action ); */
/* static void exit_up( bool action ); */
/* static void debug_up( bool action ); */
/* static void files_up( bool action ); */
/* static void about_up( bool action ); */
/* static Button menu_buttons[] = { */
/* {0, 0, 0, 79, 20, BUTTON_B1RELEASE, "Exit", NULL, exit_up }, */
@ -21,14 +21,14 @@ enum MenuButtons { MENU_EXIT, MENU_DEBUG, MENU_FILES, MENU_ABOUT, MENU_COUNT };
// static BITMAP *menu_bmp;
/* static void exit_up( boolean action ) */
/* static void exit_up( bool action ) */
/* { */
/* if ( action ) { */
/* please_exit = true; */
/* } */
/* } */
/* static void debug_up( boolean action ) */
/* static void debug_up( bool action ) */
/* { */
/* // if (action) { */
/* // menu_buttons[MENU_DEBUG].flags |= BUTTON_DISABLED; */
@ -41,7 +41,7 @@ enum MenuButtons { MENU_EXIT, MENU_DEBUG, MENU_FILES, MENU_ABOUT, MENU_COUNT };
/* // } */
/* } */
/* static void files_up( boolean action ) */
/* static void files_up( bool action ) */
/* { */
/* // if (action) { */
/* // menu_buttons[MENU_DEBUG].flags &= ~BUTTON_DISABLED; */
@ -54,7 +54,7 @@ enum MenuButtons { MENU_EXIT, MENU_DEBUG, MENU_FILES, MENU_ABOUT, MENU_COUNT };
/* // } */
/* } */
/* static void about_up( boolean action ) */
/* static void about_up( bool action ) */
/* { */
/* // if (action) { */
/* // menu_buttons[MENU_DEBUG].flags &= ~BUTTON_DISABLED; */

View file

@ -53,7 +53,7 @@ void ports_exit( void ) {}
void ports_switch_bank( address adr )
{
boolean need_remap = false;
bool need_remap = false;
if ( current_bank != ( ( ( byte )adr >> 1 ) & 0x1F ) ) {
current_bank = ( ( byte )adr >> 1 ) & 0x1F;

View file

@ -7,6 +7,5 @@ typedef unsigned char byte;
typedef unsigned short word;
typedef unsigned int dword;
typedef signed int address;
typedef char boolean;
#endif