X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?p=rmac;a=blobdiff_plain;f=sect.h;h=8759eda1dcbd9c41a996f1a5be7fae3847d1c08b;hp=735c794d23ee3d6585d5ccca73a35ad60293c3b4;hb=062214e62031c26d372edc2e68473ebb64f6a506;hpb=49cce96fba11282e4244187f15be418d5ae5bb8d

diff --git a/sect.h b/sect.h
index 735c794..8759eda 100644
--- a/sect.h
+++ b/sect.h
@@ -14,17 +14,17 @@
 // 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++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
-#define D_word(w)	   {chcheck(2);*chptr++=(char)(w>>8); *chptr++=(char)w; \
-                      sloc+=2; ch_size+=2; if(orgactive) orgaddr += 2;}
-#define D_long(lw)   {*chptr++=(char)(lw>>24); *chptr++=(char)(lw>>16);\
-	                   *chptr++=(char)(lw>>8); *chptr++=(char)lw; \
-                      sloc+=4; ch_size += 4; if(orgactive) orgaddr += 4;}
-#define D_rword(w)   {*chptr++=(char)w; *chptr++=(char)(w>>8); \
-                      sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
-#define D_rlong(lw)  {*chptr++=(char)(lw>>16);*chptr++=(char)(lw>>24);\
-                      *chptr++=(char)lw;*chptr++=(char)(lw>>8); \
-                      sloc+=4; ch_size += 4;if(orgactive) orgaddr += 4;}
+#define D_byte(b)	{*chptr++=(char)b; ++sloc; ++ch_size; if(orgactive) ++orgaddr;}
+#define D_word(w)	{chcheck(2);*chptr++=(char)(w>>8); *chptr++=(char)w; \
+						sloc+=2; ch_size+=2; if(orgactive) orgaddr += 2;}
+#define D_long(lw)	{*chptr++=(char)(lw>>24); *chptr++=(char)(lw>>16);\
+						*chptr++=(char)(lw>>8); *chptr++=(char)lw; \
+						sloc+=4; ch_size += 4; if(orgactive) orgaddr += 4;}
+//#define D_rword(w)	{*chptr++=(char)w; *chptr++=(char)(w>>8); \
+//						sloc+=2; ch_size+=2;if(orgactive) orgaddr += 2;}
+//#define D_rlong(lw)	{*chptr++=(char)(lw>>16);*chptr++=(char)(lw>>24);\
+//						*chptr++=(char)lw;*chptr++=(char)(lw>>8); \
+//						sloc+=4; ch_size += 4;if(orgactive) orgaddr += 4;}
 
 #define NSECTS       16				// Max. number of sections
 
@@ -64,14 +64,15 @@
 #define FU_PCREL     020			// Subtract PC first
 #define FU_EXPR      040			// Expression (not symbol) follows
 
+#define FUMASKRISC	0x0F00			// Mask for RISC fixup cases
 #define FU_MOVEI     0x0100
 #define FU_JR        0x0200
-#define FU_MJR       0x0300
 #define FU_REGONE    0x0400
 #define FU_NUM15     0x0500
 #define FU_NUM31     0x0600
 #define FU_NUM32     0x0700
 #define FU_REGTWO    0x0800
+
 #define FU_SUB32     0x1000
 #define FU_ISBRA     0x2000			// Word forward fixup is a BRA or DBRA
 #define FU_LBRA      0x4000			// Long branch, for short branch detect
@@ -83,8 +84,8 @@ CHUNK {
    CHUNK * chnext;					// Next, previous chunks in section
    CHUNK * chprev;
    LONG chloc;						// Base addr of this chunk
-   LONG challoc;					// #bytes allocated for chunk
-   LONG ch_size;					// #bytes chunk actually uses
+   LONG challoc;					// # bytes allocated for chunk
+   LONG ch_size;					// # bytes chunk actually uses
    char * chptr;					// Data for this chunk
 };
 
@@ -108,8 +109,8 @@ SECT {
 MCHUNK {
    MCHUNK * mcnext;					// Next mark chunk
    PTR mcptr;						// Vector of marks
-   LONG mcalloc;					// #marks allocted to mark block
-   LONG mcused;						// #marks used in block
+   LONG mcalloc;					// # marks allocted to mark block
+   LONG mcused;						// # marks used in block
 };
 
 #define MWORD        0x0000			// Marked word
@@ -120,10 +121,6 @@ MCHUNK {
 #define MCHEND       0x2000			// Indicates end of mark chunk
 #define MPCREL       0x1000			// Mark is PC-relative
 
-#define MAXFWDJUMPS  1024			// Maximum forward jumps to check
-extern unsigned fwdjump[MAXFWDJUMPS];
-extern unsigned fwindex;
-
 // Globals, external etc
 extern LONG sloc;
 extern WORD scattr;
@@ -135,13 +132,12 @@ extern LONG challoc;
 extern CHUNK * scode;
 
 // Prototypes
-void init_sect(void);
-void switchsect(int);
-void savsect(void);
+void InitSection(void);
+void SwitchSection(int);
+void SaveSection(void);
 int fixtest(int, LONG);
 int chcheck(LONG);
-int fixup(WORD, LONG, TOKEN *);
-int fixups(void);
-int resfix(int);
+int AddFixup(WORD, LONG, TOKEN *);
+int ResolveAllFixups(void);
 
 #endif // __SECT_H__