Fix for "*" getting bad section attributes, reported by A. Seed.

[rmac] / sect.h

diff --git a/sect.h b/sect.h
index 7f09d6bff314908be0612582c849ffb0ece0d132..d64e130ee32b87ff30f327c5915eca60bd418190 100644 (file)
--- a/sect.h
+++ b/sect.h
@@ -3,7 +3,7 @@
 // SECT.H - Code Generation, Fixups and Section Management
 // Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
-// Source Utilised with the Kind Permission of Landon Dyer
+// Source utilised with the kind permission of Landon Dyer
 //
 
 #ifndef __SECT_H__
@@ -14,17 +14,20 @@
 // 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;}
+// Fill n bytes with zeroes
+#define D_ZEROFILL(n)  {memset(chptr, 0, n); chptr+=n; sloc+=n; ch_size+=n;\
+                                               if (orgactive) orgaddr+=n;}
 
 #define NSECTS       16                                // Max. number of sections
 
@@ -64,14 +67,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
@@ -120,10 +124,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 +135,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 AddFixup(WORD, LONG, TOKEN *);
 int ResolveAllFixups(void);
-//int ResolveFixups(int);
 
 #endif // __SECT_H__