Added in DSP fixups to sect.c, misc. fixes for 6502 assembler.

[rmac] / riscasm.h

diff --git a/riscasm.h b/riscasm.h
index 6c64a946b44ed4f623dc63df7314416b55e723aa..b71c38e7bbc6b256a7ce79be4e6ad5d1d6984771 100644 (file)
--- a/riscasm.h
+++ b/riscasm.h
@@ -1,18 +1,15 @@
 //
-// RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System
+// RMAC - Reboot's Macro Assembler for all Atari computers
 // RISCA.H - GPU/DSP Assembler
-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2019 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 __RISCA_H__
-#define __RISCA_H__
+#ifndef __RISCASM_H__
+#define __RISCASM_H__
 
 #include "rmac.h"
-#include "procln.h"
-
-#define MAXINTERNCC 26                 // Maximum internal condition codes
 
 // RISC Instruction Types
 #define RI_NONE     0x0000             // No Operands - NOP
@@ -35,22 +32,16 @@
 #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
-};
+#define CHECK_COMMA  if (*tok++ != ',') { return error(comma_error); }
 
 // Globals, externals etc
 extern unsigned orgactive;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;
+extern uint8_t riscImmTokenSeen;
 
 // Prototypes
 int GenerateRISCCode(int);
 
-#endif // __RISCA_H__
+#endif // __RISCASM_H__