Fixes for last commit; version is now 1.10.0.

[rmac] / riscasm.h

diff --git a/riscasm.h b/riscasm.h
index 6c64a946b44ed4f623dc63df7314416b55e723aa..5b5c63bb7507597e199b1703e577a10aec614bce 100644 (file)
--- a/riscasm.h
+++ b/riscasm.h
@@ -1,16 +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
 // RISCA.H - GPU/DSP Assembler

-// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends
+// Copyright (C) 199x Landon Dyer, 2011-2017 Reboot and Friends

 // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986
 // 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__
 
 #include "rmac.h"
 //
 
 #ifndef __RISCA_H__
 #define __RISCA_H__
 
 #include "rmac.h"

-#include "procln.h"

 
 #define MAXINTERNCC 26                 // Maximum internal condition codes
 
 
 #define MAXINTERNCC 26                 // Maximum internal condition codes
 


@@ -35,7 +34,7 @@
 #define GPUONLY     0x4000             // Opcode is for the GPU Only
 #define DSPONLY     0x8000             // Opcode is for the DSP Only
 
 #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); }
+#define CHECK_COMMA  if(*tok.u32++ != ',') { error(comma_error); return(ERROR); }

 
 // Opcode Specific Data
 struct opcoderecord {
 
 // Opcode Specific Data
 struct opcoderecord {


@@ -49,6 +48,7 @@ extern unsigned orgactive;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;

+extern uint8_t riscImmTokenSeen;

 
 // Prototypes
 int GenerateRISCCode(int);
 
 // Prototypes
 int GenerateRISCCode(int);