Cleanups for the RISC assembler. Now at version 1.12.3.

[rmac] / riscasm.h

diff --git a/riscasm.h b/riscasm.h
index 834cf85cc99c089d48768088bddd579ff4e275b3..560726cce8591e62566e92ddde1dc2938f1333f6 100644 (file)
--- a/riscasm.h
+++ b/riscasm.h
@@ -1,18 +1,16 @@
 //
 // RMAC - Reboot's Macro Assembler for all Atari computers
 // RISCA.H - GPU/DSP Assembler
-// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2018 Reboot and Friends
 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // Source utilised with the kind permission of Landon Dyer
 //
 
-#ifndef __RISCA_H__
-#define __RISCA_H__
+#ifndef __RISCASM_H__
+#define __RISCASM_H__
 
 #include "rmac.h"
 
-#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
@@ -36,13 +34,6 @@
 
 #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
-};
-
 // Globals, externals etc
 extern unsigned orgactive;
 extern unsigned orgaddr;
@@ -53,4 +44,4 @@ extern uint8_t riscImmTokenSeen;
 // Prototypes
 int GenerateRISCCode(int);
 
-#endif // __RISCA_H__
+#endif // __RISCASM_H__