--- hatari/src/includes/main.h 2019/04/01 07:10:35 1.1.1.6 +++ hatari/src/includes/main.h 2019/04/01 07:12:13 1.1.1.10 @@ -10,29 +10,8 @@ typedef int BOOL; -#define PROG_NAME "Hatari v0.30" /* Name, version for window title */ -#define PROG_VERSION "v0.30" -#define VERSION_STRING "0.30 " /* Always 6 bytes(inc' NULL) */ -#define VERSION_STRING_SIZE 6 /* Size of above(inc' NULL) */ - -//#define TOTALLY_FINAL_VERSION /* Web release version... */ - -#define FINAL_VERSION /* Full-speed non-debug version for release */ -//#define DEBUG_TO_FILE /* Use debug.txt files */ -#define FIND_PERFORMANCE - -#ifndef FINAL_VERSION - #define USE_DEBUGGER /* Debugger version(non-release) */ - #define DEBUG_TO_FILE /* Use debug.txt files */ -#endif - -#ifdef TOTALLY_FINAL_VERSION - #undef DEBUG_TO_FILE /* Don't use debug files for final release */ - #undef FIND_PERFORMANCE -#endif - -#define MAX_FILENAME_LENGTH 256 -#define MAX_STRING_LENGTH 512 +#define PROG_NAME "Hatari v0.70" /* Name, version for window title */ +#define PROG_VERSION "v0.70" #include @@ -40,7 +19,8 @@ typedef int BOOL; #include #include #include -#include + +#include #ifndef FALSE @@ -50,18 +30,6 @@ typedef int BOOL; #define CALL_VAR(func) { ((void(*)(void))func)(); } -/* Binary conversion macro's */ -#define BIN2(a,b) ((a<<1)+(b)) -#define BIN3(a,b,c) ((a<<2)+(b<<1)+(c)) -#define BIN4(a,b,c,d) ((a<<3)+(b<<2)+(c<<1)+(d)) -#define BIN5(a,b,c,d,e) ((a<<4)+(b<<3)+(c<<2)+(d<<1)+(e)) -#define BIN6(a,b,c,d,e,f) ((a<<5)+(b<<4)+(c<<3)+(d<<2)+(e<<1)+(f)) -#define BIN7(a,b,c,d,e,f,g) ((a<<6)+(b<<5)+(c<<4)+(d<<3)+(e<<2)+(f<<1)+(g)) -#define BIN8(a,b,c,d,e,f,g,h) ((a<<7)+(b<<6)+(c<<5)+(d<<4)+(e<<3)+(f<<2)+(g<<1)+(h)) -#define BIN10(a,b,c,d,e,f,g,h,i,j) ((a<<9)+(b<<8)+(c<<7)+(d<<6)+(e<<5)+(f<<4)+(g<<3)+(h<<2)+(i<<1)+(j)) -#define BIN12(a,b,c,d,e,f,g,h,i,j,k,l) ((a<<11)+(b<<10)+(c<<9)+(d<<8)+(e<<7)+(f<<6)+(g<<5)+(h<<4)+(i<<3)+(j<<2)+(k<<1)+(l)) -#define BIN14(a,b,c,d,e,f,g,h,i,j,k,l,m,n) ((a<<13)+(b<<12)+(c<<11)+(d<<10)+(e<<9)+(f<<8)+(g<<7)+(h<<6)+(i<<5)+(j<<4)+(k<<3)+(l<<2)+(m<<1)+(n)) -#define BIN16(a,b,c,d,e,f,g,h,i,j,k,l,m,n,o,p) ((a<<15)+(b<<14)+(c<<13)+(d<<12)+(e<<11)+(f<<10)+(g<<9)+(h<<8)+(i<<7)+(j<<6)+(k<<5)+(l<<4)+(m<<3)+(n<<2)+(o<<1)+(p)) /* 68000 operand sizes */ #define SIZE_BYTE 1 @@ -85,53 +53,33 @@ enum { REG_A4, REG_A5, REG_A6, - REG_A7, /* ..A7(also SP) */ + REG_A7, /* ..A7 (also SP) */ }; -/* PC Condition code's */ -#define PC_CARRY 0x0001 /* Bit 0 */ -#define PC_AUX 0x0010 /* Bit 4 */ -#define PC_ZERO 0x0040 /* Bit 6 */ -#define PC_NEG 0x0080 /* Bit 7 */ -#define PC_OVERFLOW 0x0800 /* Bit 11 */ - /* 68000 Condition code's */ -#define SR_AUX 0x0010 -#define SR_NEG 0x0008 -#define SR_ZERO 0x0004 -#define SR_OVERFLOW 0x0002 -#define SR_CARRY 0x0001 - -#define SR_CLEAR_AUX 0xffef -#define SR_CLEAR_NEG 0xfff7 -#define SR_CLEAR_ZERO 0xfffb -#define SR_CLEAR_OVERFLOW 0xfffd -#define SR_CLEAR_CARRY 0xfffe - -#define SR_CCODE_MASK (SR_AUX|SR_NEG|SR_ZERO|SR_OVERFLOW|SR_CARRY) -#define SR_MASK 0xFFE0 - -#define SR_TRACEMODE 0x8000 -#define SR_SUPERMODE 0x2000 -#define SR_IPL 0x0700 +#define SR_AUX 0x0010 +#define SR_NEG 0x0008 +#define SR_ZERO 0x0004 +#define SR_OVERFLOW 0x0002 +#define SR_CARRY 0x0001 + +#define SR_CLEAR_AUX 0xffef +#define SR_CLEAR_NEG 0xfff7 +#define SR_CLEAR_ZERO 0xfffb +#define SR_CLEAR_OVERFLOW 0xfffd +#define SR_CLEAR_CARRY 0xfffe + +#define SR_CCODE_MASK (SR_AUX|SR_NEG|SR_ZERO|SR_OVERFLOW|SR_CARRY) +#define SR_MASK 0xFFE0 + +#define SR_TRACEMODE 0x8000 +#define SR_SUPERMODE 0x2000 +#define SR_IPL 0x0700 -#define SR_CLEAR_IPL 0xf8ff +#define SR_CLEAR_IPL 0xf8ff #define SR_CLEAR_TRACEMODE 0x7fff #define SR_CLEAR_SUPERMODE 0xdfff -/* Emuation condition codes, ordered so can do 'xor al,al' to set XNZVC -0000 */ -#define EMU_X 0x0100 -#define EMU_N 0x0080 -#define EMU_Z 0x0040 -#define EMU_V 0x0020 -#define EMU_C 0x0010 - -#define EMU_CLEAR_X 0xfeff -#define EMU_CLEAR_N 0xff7f -#define EMU_CLEAR_Z 0xffbf -#define EMU_CLEAR_V 0xffdf -#define EMU_CLEAR_C 0xffef - /* Exception vectors */ #define EXCEPTION_BUSERROR 0x00000008 #define EXCEPTION_ADDRERROR 0x0000000c @@ -162,14 +110,14 @@ enum { Clock cycles per line (50Hz) : 512 NOPs per scan line (50Hz) : 128 - Scan lines per VBL (50Hz) : 313(64 at top,200 screen,49 bottom) + Scan lines per VBL (50Hz) : 313 (64 at top,200 screen,49 bottom) Clock cycles per line (60Hz) : 508 NOPs per scan line (60Hz) : 127 - Scan lines per VBL (60Hz) : 315 + Scan lines per VBL (60Hz) : 263 - Clock cycles per VBL : 160256 - NOPs per VBL : 40064 + Clock cycles per VBL (50Hz) : 160256 + NOPs per VBL (50Hz) : 40064 Pixels per clock cycle (low res) : 1 Pixels per clock cycle (med res) : 2 @@ -199,20 +147,16 @@ enum { #define SCREEN_START_CYCLE 96 /* Cycle first normal pixel appears on */ #define SCANLINES_PER_FRAME 313 /* Number of scan lines per frame */ #define CYCLES_PER_LINE 512 /* Cycles per horiztonal line scan */ +#define CYCLES_VBL_IN (SCREEN_START_HBL*CYCLES_PER_LINE) /* ((28+64)*CYCLES_PER_LINE) */ #define CYCLES_PER_FRAME (SCANLINES_PER_FRAME*CYCLES_PER_LINE) /* Cycles per VBL @ 50fps = 160256 */ -#define CYCLES_VBL_IN (SCREEN_START_HBL*CYCLES_PER_LINE) /*((28+64)*CYCLES_PER_LINE) */ #define CYCLES_PER_SEC (CYCLES_PER_FRAME*50) /* Cycles per second */ #define CYCLES_ENDLINE (64+320+88+40) /* DE(Display Enable) */ #define CYCLES_HBL (CYCLES_PER_LINE+96) /* Cycles for first HBL - very inaccurate on ST */ -#define CYCLES_DEBUGGER 3000 /* Check debugger every 'x' cycles */ /* Illegal Opcode used to help emulation. eg. free entries are 8 to 15 inc' */ #define GEMDOS_OPCODE 8 /* Free op-code to intercept GemDOS trap */ -#define RUNOLDGEMDOS_OPCODE 9 /* Free op-code to set PC to old GemDOS vector(if doesn't need to intercept) */ -#define CONDRV_OPCODE 10 /* Free op-code to intercept set up connected drives */ -#define TIMERD_OPCODE 11 /* Free op-code to prevent Timer D starting in GemDOS */ +#define SYSINIT_OPCODE 10 /* Free op-code to initialize system (connected drives etc.) */ #define VDI_OPCODE 12 /* Free op-code to call VDI handlers AFTER Trap#2 */ -#define LINEA_OPCODE 13 /* Free op-code to call handlers AFTER Line-A */ #define PRG_HEADER_SIZE 0x1c /* Size of header at start of ST .prg files */ @@ -221,16 +165,14 @@ enum { extern BOOL bQuitProgram; extern BOOL bEnableDebug; extern BOOL bEmulationActive; -extern char szName[]; -extern char szBootDiscImage[MAX_FILENAME_LENGTH]; -extern char szWorkingDir[MAX_FILENAME_LENGTH]; -extern char szCurrentDir[MAX_FILENAME_LENGTH]; +extern char szBootDiscImage[FILENAME_MAX]; +extern char szWorkingDir[FILENAME_MAX]; + extern void Main_MemorySnapShot_Capture(BOOL bSave); -extern void Main_SysError(char *Error,char *Title); -extern int Main_Message(char *lpText, char *lpCaption /*, unsigned int uType*/); extern void Main_PauseEmulation(void); extern void Main_UnPauseEmulation(void); -extern void Main_EventHandler(); +extern void Main_WarpMouse(int x, int y); +extern void Main_EventHandler(void); #endif /* ifndef HATARI_MAIN_H */