From 1feb728a9eb579b6441daf0124d81483f600365c Mon Sep 17 00:00:00 2001 From: Graeme Hinchliffe Date: Tue, 21 Jun 2016 09:01:12 +0100 Subject: [PATCH] Improved indexed reg error - Added more helpful Indexing error message - Added error condition for EQUR Indexing errors - Updated patch # and copyright year --- riscasm.c | 78 +++++++++++++++++++++++++++++++++++++++---------------- rmac.c | 16 ++++++------ version.h | 4 +-- 3 files changed, 66 insertions(+), 32 deletions(-) diff --git a/riscasm.c b/riscasm.c index 78bae9c..9d95bfc 100644 --- a/riscasm.c +++ b/riscasm.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // RISCA.C - 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 // Source utilised with the kind permission of Landon Dyer // @@ -18,7 +18,7 @@ #define DEF_MR // Declare keyword values #include "risckw.h" // Incl. generated risc keywords -#define DEF_KW // Declare keyword values +#define DEF_KW // Declare keyword values #include "kwtab.h" // Incl. generated keyword tables & defs @@ -32,7 +32,7 @@ uint8_t riscImmTokenSeen; // The '#' (immediate) token was seen const char reg_err[] = "missing register R0...R31"; // Jaguar jump condition names -const char condname[MAXINTERNCC][5] = { +const char condname[MAXINTERNCC][5] = { "NZ", "Z", "NC", "NCNZ", "NCZ", "C", "CNZ", "CZ", "NN", "NNNZ", "NNZ", "N", "N_NZ", "N_Z", "T", "A", "NE", "EQ", "CC", "HS", "HI", "CS", "LO", "PL", "MI", "F" @@ -131,6 +131,32 @@ static inline int MalformedOpcode(int signal) return errors("Malformed opcode [internal $%s]", buf); } +// +// Function to return "Illegal Indexed Register" error +// Anyone trying to index something other than R14 or R15 +// +static inline int IllegalIndexedRegister(int reg) +{ + char buf[16]; + sprintf(buf, "%d", reg - KW_R0); + return errors("Attempted index reference with non-indexable register (r%s)", buf); +} + +// +// Function to return "Illegal Indexed Register" error for EQUR scenarios +// Trying to use register value within EQUR that isn't 14 or 15 +// +static inline int IllegalIndexedRegisterEqur(SYM *sy) +{ + //char buf[160]; + char *buf = NULL; + buf = (char *)malloc((strlen(sy->sname) + 7) * sizeof(char)); + if (NULL != buf) { + sprintf(buf, "%s = r%d",sy->sname, sy->svalue); + return errors("Attempted index reference with non-indexable register within EQUR (%s)", buf); + } + return errors("Unable to allocate memory! (IllegalIndexRegisterEqur)", "OOPS"); +} // // Build RISC instruction word @@ -169,7 +195,7 @@ int GetRegister(WORD rattr) if (!(eattr & DEFINED)) { - AddFixup((WORD)(FU_WORD | rattr), sloc, r_expr); + AddFixup((WORD)(FU_WORD | rattr), sloc, r_expr); return 0; } @@ -230,17 +256,17 @@ int GenerateRISCCode(int state) reg2 = GetRegister(FU_REGTWO); at_eol(); BuildRISCIntructionWord(parm, parm >> 6, reg2); - break; + break; // Two operand instructions (Rs,Rd) // ADD, ADDC, AND, CMP, DIV, IMACN, IMULT, IMULTN, MOVEFA, MOVETA, MULT, // MMULT, MTOI, NORMI, OR, ROR, SH, SHA, SUB, SUBC, XOR - case RI_TWO: + case RI_TWO: if (parm == 37) altbankok = 1; // MOVEFA reg1 = GetRegister(FU_REGONE); - CHECK_COMMA; + CHECK_COMMA; if (parm == 36) altbankok = 1; // MOVETA @@ -301,8 +327,8 @@ int GenerateRISCCode(int state) if ((int)eval < reg1 || (int)eval > reg2) return error("constant out of range"); - if (parm & SUB32) - reg1 = 32 - eval; + if (parm & SUB32) + reg1 = 32 - eval; else if (type == RI_NUM_32) reg1 = (reg1 == 32 ? 0 : eval); else @@ -393,7 +419,7 @@ int GenerateRISCCode(int state) break; // (Rn),Rn = 41 / (R14/R15+n),Rn = 43/44 / (R14/R15+Rn),Rn = 58/59 - case RI_LOAD: + case RI_LOAD: indexed = 0; parm = 41; @@ -402,8 +428,14 @@ int GenerateRISCCode(int state) tok++; - if ((*tok == KW_R14 || *tok == KW_R15) && (*(tok + 1) != ')')) - indexed = (*tok - KW_R0); + if ((*(tok + 1) == '+') || (*(tok + 1) == '-')) { + // Trying to make indexed call + if ((*tok == KW_R14 || *tok == KW_R15)) { + indexed = (*tok - KW_R0); + } else { + return IllegalIndexedRegister(*tok); + } + } if (*tok == SYMBOL) { @@ -418,11 +450,13 @@ int GenerateRISCCode(int state) if (sy->sattre & EQUATEDREG) { - if (((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15) - && (*(tok + 2) != ')')) - { - indexed = (sy->svalue & 0x1F); - tok++; + if ((*(tok + 2) == '+') || (*(tok + 2) == '-')) { + if ((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15) { + indexed = (sy->svalue & 0x1F); + tok++; + } else { + return IllegalIndexedRegisterEqur(sy); + } } } } @@ -512,7 +546,7 @@ int GenerateRISCCode(int state) break; // Rn,(Rn) = 47 / Rn,(R14/R15+n) = 49/50 / Rn,(R14/R15+Rn) = 60/61 - case RI_STORE: + case RI_STORE: parm = 47; reg1 = GetRegister(FU_REGONE); CHECK_COMMA; @@ -523,7 +557,7 @@ int GenerateRISCCode(int state) tok++; indexed = 0; - if ((*tok == KW_R14 || *tok == KW_R15) && (*(tok + 1) != ')')) + if ((*tok == KW_R14 || *tok == KW_R15) && (*(tok + 1) != ')')) indexed = (*tok - KW_R0); if (*tok == SYMBOL) @@ -536,7 +570,7 @@ int GenerateRISCCode(int state) return ERROR; } - if (sy->sattre & EQUATEDREG) + if (sy->sattre & EQUATEDREG) { if (((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15) && (*(tok + 2) != ')')) @@ -634,7 +668,7 @@ int GenerateRISCCode(int state) break; // LOADB/LOADP/LOADW (Rn),Rn - case RI_LOADN: + case RI_LOADN: if (*tok != '(') return MalformedOpcode(0x0B); @@ -652,7 +686,7 @@ int GenerateRISCCode(int state) break; // STOREB/STOREP/STOREW Rn,(Rn) - case RI_STOREN: + case RI_STOREN: reg1 = GetRegister(FU_REGONE); CHECK_COMMA; diff --git a/rmac.c b/rmac.c index 4e82346..5745d52 100644 --- a/rmac.c +++ b/rmac.c @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // RMAC.C - Main Application Code -// Copyright (C) 199x Landon Dyer, 2011 Reboot and Friends +// Copyright (C) 199x Landon Dyer, 2011 - 2016 Reboot and Friends // RMAC derived from MADMAC v1.07 Written by Landon Dyer, 1986 // Source utilised with the kind permission of Landon Dyer // @@ -34,7 +34,7 @@ int legacy_flag; // Do stuff like insert code in RISC assembler int obj_format; // Object format flag int debug; // [1..9] Enable debugging levels int err_flag; // '-e' specified -int err_fd; // File to write error messages to +int err_fd; // File to write error messages to int rgpu, rdsp; // Assembling Jaguar GPU or DSP code int list_fd; // File to write listing to int regbank; // RISC register bank @@ -67,7 +67,7 @@ char * fext(char * name, char * extension, int stripp) // Clobber any old extension, if requested if (stripp) { - for(s=beg; *s && *s!='.'; ++s) + for(s=beg; *s && *s!='.'; ++s) ; *s = '\0'; @@ -84,7 +84,7 @@ char * fext(char * name, char * extension, int stripp) // Return 'item'nth element of semicolon-seperated pathnames specified in the // enviroment string 's'. Copy the pathname to 'buf'. Return 0 if the 'item' // nth path doesn't exist. -// +// // ['item' ranges from 0 to N-1, where N = #elements in search path] // int nthpath(char * env_var, int itemno, char * buf) @@ -166,7 +166,7 @@ void DisplayVersion(void) "| | | | | | | | (_| | (__ \n" "|_| |_| |_| |_|\\__,_|\\___|\n" "\nReboot's Macro Assembler\n" - "Copyright (C) 199x Landon Dyer, 2011-2015 Reboot\n" + "Copyright (C) 199x Landon Dyer, 2011-2017 Reboot\n" "V%01i.%01i.%01i %s (%s)\n\n", MAJOR, MINOR, PATCH, __DATE__, PLATFORM); } @@ -218,7 +218,7 @@ int Process(int argc, char ** argv) SYM * sy; // Pointer to a symbol record char * s; // String pointer int fd; // File descriptor - char fnbuf[FNSIZ]; // Filename buffer + char fnbuf[FNSIZ]; // Filename buffer int i; // Iterator errcnt = 0; // Initialise error count @@ -377,7 +377,7 @@ int Process(int argc, char ** argv) case 'R': switch(argv[argno][2]) { - case 'w': case 'W': segpadsize = 2; break; + case 'w': case 'W': segpadsize = 2; break; case 'l': case 'L': segpadsize = 4; break; case 'p': case 'P': segpadsize = 8; break; case 'd': case 'D': segpadsize = 16; break; @@ -595,7 +595,7 @@ int main(int argc, char ** argv) // If commands were passed in, process them if (argc > 1) - return Process(argc - 1, argv + 1); + return Process(argc - 1, argv + 1); DisplayVersion(); DisplayHelp(); diff --git a/version.h b/version.h index f02916e..b24415f 100644 --- a/version.h +++ b/version.h @@ -1,7 +1,7 @@ // // RMAC - Reboot's Macro Assembler for the Atari Jaguar Console System // VERSION.H - Version Information -// 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 // Source utilised with the kind permission of Landon Dyer // @@ -13,6 +13,6 @@ #define MAJOR 1 // Major version number #define MINOR 4 // Minor version number -#define PATCH 20 // Patch release number +#define PATCH 21 // Patch release number #endif // __VERSION_H__ -- 2.37.2