X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=rmac.h;h=3d23ed55573b8c73554f5aeb0bc78f656a500f51;hp=a2cc1c8a270d38677e6d98ccc05daecd18b1414b;hb=HEAD;hpb=4205233c8397c581b4d27ab36ab81ec896ef3dd0 diff --git a/rmac.h b/rmac.h index a2cc1c8..48a6545 100644 --- a/rmac.h +++ b/rmac.h @@ -1,7 +1,7 @@ // -// RMAC - Reboot's Macro Assembler for all Atari computers +// RMAC - Renamed Macro Assembler for all Atari computers // RMAC.H - Main Application Code -// Copyright (C) 199x Landon Dyer, 2011-2020 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011-2022 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -22,11 +22,14 @@ #if defined(WIN32) || defined(WIN64) #include #include + #include "dirent_lose.h" // Release platform - windows #define PLATFORM "Win32" #define _OPEN_FLAGS _O_TRUNC|_O_CREAT|_O_BINARY|_O_RDWR #define _OPEN_INC _O_RDONLY|_O_BINARY #define _PERM_MODE _S_IREAD|_S_IWRITE + #define PATH_SEPS ";" + #define realpath(_fn, _abs) _fullpath((_abs), (_fn), _MAX_PATH) #ifdef _MSC_VER #if _MSC_VER > 1000 @@ -38,7 +41,6 @@ #define STRINGIZE(x) STRINGIZE_HELPER(x) #define WARNING(desc) __pragma(message(__FILE__ "(" STRINGIZE(__LINE__) ") : Warning: " #desc)) #define inline __inline - // usage: // WARNING(FIXME: Code removed because...) @@ -53,8 +55,19 @@ #endif + // Ever since Visual Studio... 2017? 2019? the following constants come + // defined in the platform SDK, which leads to endless warnings from the + // compiler. So let's just put the pacifier on and undef them, sheesh! (No, + // we won't rename the defines, we've been here since 1986, Visual Studio + // wasn't even a glimpse in the milkman's eyes, if you catch my drift) + #undef CONST + #undef ERROR + #undef TEXT + #else + #include + #ifdef __GCCUNIX__ #include @@ -64,6 +77,7 @@ #define _OPEN_FLAGS O_TRUNC|O_CREAT|O_RDWR #define _OPEN_INC O_RDONLY #define _PERM_MODE S_IRUSR|S_IWUSR + #define PATH_SEPS ";:" #ifdef __MINGW32__ #define off64_t long @@ -86,6 +100,7 @@ #define _OPEN_FLAGS O_TRUNC|O_CREAT|O_RDWR #define _OPEN_INC O_RDONLY #define _PERM_MODE S_IREAD|S_IWRITE + #define PATH_SEPS ":;" // Defined here, even though the platform may not support it... #define DO_PRAGMA(x) _Pragma (#x) #define WARNING(desc) DO_PRAGMA(message (#desc)) @@ -177,12 +192,13 @@ enum { ALCYON, // Alcyon/DRI C object format -MWC, // Mark Williams object format BSD, // BSD object format ELF, // ELF object format LOD, // DSP 56001 object format P56, // DSP 56001 object format XEX, // COM/EXE/XEX/whatever a8 object format +RAW, // Output at absolute address +C64PRG, // C64 .PRG format }; // Assembler token @@ -208,6 +224,7 @@ PTR #define LABEL 0 // User-defined symbol #define MACRO 1 // Macro definition #define MACARG 2 // Macro argument +#define DBGSYM 3 // stabs debug symbol #define SY_UNDEF -1 // Undefined (lookup never matches it) // Symbol and expression attributes @@ -218,6 +235,7 @@ PTR #define EQUATED 0x0800 // Symbol was equated #define SDECLLIST 0x0400 // Symbol is on 'sdecl'-order list #define FLOAT 0x0200 // Symbol is a floating point value +#define RISCREG 0x0100 // Symbol is a RISC register // Expression spaces, ORed with symbol and expression attributes above #define ABS 0x0000 // In absolute space @@ -244,52 +262,32 @@ PTR #define SIZP 0x0080 // .p (FPU pakced decimal real) #define SIZQ 0x0100 // .q (quad word) -// RISC register bank definitions (used in extended symbol attributes also) -#define BANK_N 0x0000 // No register bank specified -#define BANK_0 0x0001 // Register bank zero specified -#define BANK_1 0x0002 // Register bank one specified +// Extended attributes #define EQUATEDREG 0x0008 // Equated register symbol #define UNDEF_EQUR 0x0010 #define EQUATEDCC 0x0020 #define UNDEF_CC 0x0040 -// Construct binary constants at compile time -// Code by Tom Torfs - -// Helper macros -#define HEX__(n) 0x##n##LU -#define B8__(x) \ - ((x&0x0000000FLU)?1:0) \ -+((x&0x000000F0LU)?2:0) \ -+((x&0x00000F00LU)?4:0) \ -+((x&0x0000F000LU)?8:0) \ -+((x&0x000F0000LU)?16:0) \ -+((x&0x00F00000LU)?32:0) \ -+((x&0x0F000000LU)?64:0) \ -+((x&0xF0000000LU)?128:0) - -// User macros -#define B8(d) ((uint8_t)B8__(HEX__(d))) -#define B16(dmsb,dlsb) (((uint16_t)B8(dmsb)<<8) + B8(dlsb)) -#define B32(dmsb,db2,db3,dlsb) (((uint32_t)B8(dmsb)<<24) \ -+ ((uint32_t)B8(db2)<<16) \ -+ ((uint32_t)B8(db3)<<8) \ -+ B8(dlsb)) - // Optimisation defines enum { + // These will be set to on/off when .opt "+Oall"/"~Oall" is called OPT_ABS_SHORT = 0, OPT_MOVEL_MOVEQ = 1, OPT_BSR_BCC_S = 2, - OPT_INDIRECT_DISP = 3, + OPT_OUTER_DISP = 3, OPT_LEA_ADDQ = 4, - OPT_BASE_DISP = 5, + OPT_020_DISP = 5, // 020+ base and outer displacements (bd, od) absolute long to short OPT_NULL_BRA = 6, OPT_CLR_DX = 7, OPT_ADDA_ADDQ = 8, OPT_ADDA_LEA = 9, - OPT_COUNT // Dummy, used to count number of optimisation switches + OPT_56K_SHORT = 10, + OPT_56K_AUTO_LONG = 11, + OPT_COUNT, // Dummy, used to count number of optimisation switches + // These will be unaffected by "Oall" + OPT_PC_RELATIVE = 30, // Enforce PC relative + OPT_COUNT_ALL // Dummy, used to count all switches }; // Exported variables @@ -300,23 +298,29 @@ extern int robjproc; extern int dsp56001; extern int err_flag; extern int err_fd; -extern int regbank; extern char * firstfname; extern int list_fd; extern int list_pag; -extern int as68_flag; extern int m6502; extern int list_flag; extern int glob_flag; extern int lsym_flag; -extern int sbra_flag; +extern int dsym_flag; +extern int optim_warn_flag; extern int obj_format; extern int legacy_flag; extern int prg_flag; // 1 = write ".PRG" relocatable executable extern LONG PRGFLAGS; -extern int optim_flags[OPT_COUNT]; +extern int optim_flags[OPT_COUNT_ALL]; extern int activecpu; extern int activefpu; +extern uint32_t org68k_address; +extern int org68k_active; +extern int *regbase; +extern int *regtab; +extern int *regcheck; +extern int *regaccept; +extern uint32_t used_architectures; // Exported functions void strtoupper(char * s);