]> Shamusworld >> Repos - rmac/blobdiff - sect.h
Roll back TOKENPTR changes and most of the .u32 changes weren't needed.
[rmac] / sect.h
diff --git a/sect.h b/sect.h
index d34dec23317413802052636e48fbfd9bbba93764..073d625d62779f2b6db06e1af063cbdff909026b 100644 (file)
--- a/sect.h
+++ b/sect.h
@@ -1,7 +1,7 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // SECT.H - Code Generation, Fixups and Section Management
-// Copyright (C) 199x Landon Dyer, 2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
@@ -13,7 +13,6 @@
 
 // Macros to deposit code in the current section
 // D_rword deposits a "6502" format (low, high) word (01).
-// D_rlong deposits a MWC "canonical byte order" longword (2301).
 #define D_byte(b)      {*chptr++=(uint8_t)(b); sloc++; ch_size++; \
                                                if(orgactive) orgaddr++;}
 #define D_word(w)      {chcheck(2);*chptr++=(uint8_t)((w)>>8); \
                                                *chptr++=(uint8_t)((lw)>>8); \
                                                *chptr++=(uint8_t)(lw); \
                                                sloc += 4; ch_size += 4; if(orgactive) orgaddr += 4;}
-#define D_rword(w)     {*chptr++=(uint8_t)w; *chptr++=(uint8_t)(w>>8); \
+#define D_quad(qw)     {*chptr++=(uint8_t)((qw)>>56); \
+                                               *chptr++=(uint8_t)((qw)>>48);\
+                                               *chptr++=(uint8_t)((qw)>>40);\
+                                               *chptr++=(uint8_t)((qw)>>32);\
+                                               *chptr++=(uint8_t)((qw)>>24);\
+                                               *chptr++=(uint8_t)((qw)>>16);\
+                                               *chptr++=(uint8_t)((qw)>>8); \
+                                               *chptr++=(uint8_t)(qw); \
+                                               sloc += 8; ch_size += 8; if(orgactive) orgaddr += 8;}
+#define D_rword(w)     {*chptr++=(uint8_t)(w); *chptr++=(uint8_t)((w)>>8); \
                                                sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
-//#define D_rlong(lw)  {*chptr++=(uint8_t)(lw>>16);*chptr++=(uint8_t)(lw>>24);\
-//                                             *chptr++=(uint8_t)lw;*chptr++=(uint8_t)(lw>>8); \
-//                                             sloc+=4; ch_size += 4;if(orgactive) orgaddr += 4;}
+#define D_single(w) {chcheck(4);*chptr++ = ((char *)&w)[3]; \
+                                               *chptr++ = ((char *)&w)[2]; \
+                                               *chptr++ = ((char *)&w)[1]; \
+                                               *chptr++=((char *)&w)[0]; \
+                                               sloc+=4; ch_size += 4; if(orgactive) orgaddr += 4;}
+#define D_double(w) {chcheck(8);*chptr++=(char)((*(unsigned long long *)&w)); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>8); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>16); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>24); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>32); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>40); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>48); \
+                                               *chptr++=(char)((*(unsigned long long *)&w)>>56); \
+                                               sloc+=8; ch_size += 8; if(orgactive) orgaddr += 8;}
+#ifdef _MSC_VER
+#define D_extend(w) {chcheck(12); *chptr++ = (char)((*(unsigned long long *)&w) >> 56); \
+*chptr++ = (char)(((*(unsigned long long *)&w) >> (52)) & 0xf); \
+*chptr++ = (char)(0); \
+*chptr++ = (char)(0); \
+*chptr++ = (char)(((*(unsigned long long *)&w) >> (48 - 3))|0x80 /* assume that the number is normalised */); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (40 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (32 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (24 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (16 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w) >> (8 - 3)); \
+*chptr++ = (char)((*(unsigned long long *)&w << 3)); \
+*chptr++=(char)(0); \
+       sloc+=12; ch_size += 12; if(orgactive) orgaddr += 12;}
+#elif defined(LITTLE_ENDIAN)
+#define D_extend(w) {chcheck(12);*chptr++=((char *)&w)[0]; \
+                                               *chptr++=((char *)&w)[1]; \
+                                               *chptr++=((char *)&w)[2]; \
+                                               *chptr++=((char *)&w)[3]; \
+                                               *chptr++=((char *)&w)[4]; \
+                                               *chptr++=((char *)&w)[5]; \
+                                               *chptr++=((char *)&w)[6]; \
+                                               *chptr++=((char *)&w)[7]; \
+                                               *chptr++=((char *)&w)[8]; \
+                                               *chptr++=((char *)&w)[9]; \
+                                               *chptr++=((char *)&w)[10]; \
+                                               *chptr++=((char *)&w)[11]; \
+                                               sloc+=12; ch_size += 12; if(orgactive) orgaddr += 12;}
+
+#else
+
+WARNING(Please implement a non-byte swapped D_extend!)
+//stopgap for now, until this can be implemented proppa-ly :-P
+#define D_extend(w) {chcheck(12); chptr+=12; sloc+=12; ch_size+=12; if(orgactive) orgaddr +=12;}
+
+#endif
 // Fill n bytes with zeroes
 #define D_ZEROFILL(n)  {memset(chptr, 0, n); chptr+=n; sloc+=n; ch_size+=n;\
                                                if (orgactive) orgaddr+=n;}
 // token.L     expression list
 // (etc)
 // ENDEXPR.L   (end of expression)
-#define FUMASK       007               // Mask for fixup cases:
-#define FU_QUICK     000               // Fixup 3-bit quick instr field
-#define FU_BYTE      001               // Fixup byte
-#define FU_WORD      002               // Fixup word
-#define FU_WBYTE     003               // Fixup byte (at loc+1)
-#define FU_LONG      004               // Fixup long
-#define FU_BBRA      005               // Fixup byte branch
-#define FU_6BRA      007               // Fixup 6502-format branch offset
-#define FU_BYTEH     050        // Fixup 6502 high byte of immediate word
-#define FU_BYTEL     051        // Fixup 6502 low byte of immediate word
-#define FU_SEXT      010               // Ok to sign extend
-#define FU_PCREL     020               // Subtract PC first
-#define FU_EXPR      040               // Expression (not symbol) follows
+#define FUMASK       0x000F            // Mask for fixup cases:
+#define FU_QUICK     0x0000            // Fixup 3-bit quick instruction field
+#define FU_BYTE      0x0001            // Fixup byte
+#define FU_WORD      0x0002            // Fixup word
+#define FU_WBYTE     0x0003            // Fixup byte (at loc+1)
+#define FU_LONG      0x0004            // Fixup long
+#define FU_BBRA      0x0005            // Fixup byte branch
+#define FU_6BRA      0x0007            // Fixup 6502-format branch offset
+#define FU_BYTEH     0x0008            // Fixup 6502 high byte of immediate word
+#define FU_BYTEL     0x0009            // Fixup 6502 low byte of immediate word
+
+#define FU_SEXT      0x0010            // Ok to sign extend
+#define FU_PCREL     0x0020            // Subtract PC first
+#define FU_EXPR      0x0040            // Expression (not symbol) follows
 
 #define FU_GLOBAL    0x0080            // Mark global symbol
 
 #define FU_LBRA      0x4000            // Long branch, for short branch detect
 #define FU_DONE      0x8000            // Fixup has been done
 
+// FPU fixups
+// TODO: these are obviously bogus for now!
+#define FU_FLOATSING 0x0D0B            // Fixup 32-bit float
+#define FU_FLOATDOUB 0x0E0B            // Fixup 64-bit float
+#define FU_FLOATEXT  0x0F0B            // Fixup 96-bit float
+
 // Chunks are used to hold generated code and fixup records
 #define CHUNK  struct _chunk
 CHUNK {
@@ -112,6 +174,30 @@ SECT {
        CHUNK * sfix;                           // Last fixup chunk
 };
 
+// 680x0 defines
+#define CPU_68000 1
+#define CPU_68020 2
+#define CPU_68030 4
+#define CPU_68040 8
+#define CPU_68060 16
+#define FPU_NONE  0
+#define FPU_68881 1
+#define FPU_68882 2
+#define FPU_68040 4
+
+// Helper macros to test for active CPU
+#define CHECK00 if (activecpu == CPU_68000) return error(unsupport)
+#define CHECK20 if (activecpu == CPU_68020) return error(unsupport)
+#define CHECK30 if (activecpu == CPU_68030) return error(unsupport)
+#define CHECK40 if (activecpu == CPU_68040) return error(unsupport)
+#define CHECK60 if (activecpu == CPU_68060) return error(unsupport)
+#define CHECKNO00 if (activecpu != CPU_68000) return error(unsupport)
+#define CHECKNO20 if (activecpu != CPU_68020) return error(unsupport)
+#define CHECKNO30 if (activecpu != CPU_68030) return error(unsupport)
+#define CHECKNO40 if (activecpu != CPU_68040) return error(unsupport)
+#define CHECKNO60 if (activecpu != CPU_68060) return error(unsupport)
+
+
 // Globals, external etc
 extern uint32_t sloc;
 extern uint16_t scattr;