First stab at removing cruft.

[rmac] / risca.h

diff --git a/risca.h b/risca.h
index 4706bf28c1de07aff76e9753aaef225e49b0029c..0ebff2fce24f3666e4a8988133bbaeaf035f9e79 100644 (file)
--- a/risca.h
+++ b/risca.h
@@ -12,37 +12,37 @@
 #include "rmac.h"
 #include "procln.h"
 
-#define MAXINTERNCC      26            // Maximum internal condition codes
+#define MAXINTERNCC      26                            // Maximum internal condition codes
 
 // RISC Instruction Types
-#define RI_NONE          0x0000        // No Operands - NOP
-#define RI_ONE           0x0001        // One Operand - Rd - ABS/NEG/etc
-#define RI_TWO           0x0002        // Two Operands - Rs,Rd - Most Instructions
-#define RI_NUM_15        0x0003        // Numeric Operand - n,Rd - n=-16..+15 - CMPQ
-#define RI_NUM_31        0x0004        // Numeric Operand - n,Rd - n=0..31 - BCLR/BSET/BTST/MOVEQ
-#define RI_NUM_32        0x0005        // Numeric Operand - n,Rd - n=1..32 - ADDQ/SUBQ
-#define RI_JR            0x0006        // Jump Relative - cc,n - n=-16..+15 words, reg2=cc
-#define RI_JUMP          0x0007        // Jump Absolute - cc,(Rs) - reg2=cc
-#define RI_MOVEI         0x0008        // Move Immediate - n,Rn - n in second word
-#define RI_MOVE          0x0009        // MOVE Instruction - PC,Rn / Rn,Rn
-#define RI_LOAD          0x000A        // LOAD Instruction - Various Forms
-#define RI_LOADN         0x000B        // LOADB/LOADP/LOADW - (Rs),Rd
-#define RI_STORE         0x000C        // STORE Instruction - Various Forms
-#define RI_STOREN        0x000D        // STOREB/STOREP/STOREM - Rs,(Rd)
-#define RI_MJMP          0x000E        // MJMP psuedo instruction 
+#define RI_NONE          0x0000                        // No Operands - NOP
+#define RI_ONE           0x0001                        // One Operand - Rd - ABS/NEG/etc
+#define RI_TWO           0x0002                        // Two Operands - Rs,Rd - Most Instructions
+#define RI_NUM_15        0x0003                        // Numeric Operand - n,Rd - n=-16..+15 - CMPQ
+#define RI_NUM_31        0x0004                        // Numeric Operand - n,Rd - n=0..31 - BCLR/BSET/BTST/MOVEQ
+#define RI_NUM_32        0x0005                        // Numeric Operand - n,Rd - n=1..32 - ADDQ/SUBQ
+#define RI_JR            0x0006                        // Jump Relative - cc,n - n=-16..+15 words, reg2=cc
+#define RI_JUMP          0x0007                        // Jump Absolute - cc,(Rs) - reg2=cc
+#define RI_MOVEI         0x0008                        // Move Immediate - n,Rn - n in second word
+#define RI_MOVE          0x0009                        // MOVE Instruction - PC,Rn / Rn,Rn
+#define RI_LOAD          0x000A                        // LOAD Instruction - Various Forms
+#define RI_LOADN         0x000B                        // LOADB/LOADP/LOADW - (Rs),Rd
+#define RI_STORE         0x000C                        // STORE Instruction - Various Forms
+#define RI_STOREN        0x000D                        // STOREB/STOREP/STOREM - Rs,(Rd)
+#define RI_MJMP          0x000E                        // MJMP psuedo instruction 
 
 // Supplementry Instruction Flags
-#define SUB32           0x2000         // (n = 32-n)
-#define GPUONLY         0x4000         // Opcode is for the GPU Only
-#define DSPONLY         0x8000         // Opcode is for the DSP Only
+#define SUB32           0x2000                 // (n = 32-n)
+#define GPUONLY         0x4000                 // Opcode is for the GPU Only
+#define DSPONLY         0x8000                 // Opcode is for the DSP Only
 
 #define CHECK_COMMA                    if(*tok++ != ',') { error(comma_error); return(ERROR); }
 
 // Opcode Specific Data
 struct opcoderecord {
-   short state;                        // Opcode Name
-   unsigned short typ;                 // Opcode Type
-   unsigned parm;                      // Opcode Parameter
+   short state;                                                        // Opcode Name
+   unsigned short typ;                                 // Opcode Type
+   unsigned parm;                                              // Opcode Parameter
 };
 
 // Globals, externals etc
@@ -50,7 +50,7 @@ extern unsigned orgactive;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;
-extern int jpad;
+//extern int jpad;
 
 // Prototypes
 int risccg(int);