X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.h;h=65264ae313e4113c7452ac8430f3c66794c6a380;hp=b4c3733cab4c4aac1f560620f880d33d1fafe3c8;hb=945e321301df72bccb8d6abf2975b6871926b9a0;hpb=60f204cb9e3905100da0d89f14bb40db764acd9e

diff --git a/sect.h b/sect.h
index b4c3733..65264ae 100644
--- a/sect.h
+++ b/sect.h
@@ -24,8 +24,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); \
-//						sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
+#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;}
@@ -59,17 +59,20 @@
 // 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_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:(shouldn't this be $7F?)
+#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