First stab at removing cruft.

Removing all automatic code munging in the background by the RISC
compiler, including GPU in main idiocy. This means there are no more
built-in macros either. If you really needed this functionality, you can
put macros in your source code to do it. It doesn't belong in the guts
of the assembler.

diff --git a/direct.c b/direct.c
index 4a9311c816d7dae54010af3ee7625a7ed85ccbf8..a14307dde1b9f335a1fb4569df03bdf7740f4bab 100644 (file)
--- a/direct.c
+++ b/direct.c
@@ -79,23 +79,13 @@ int (*dirtab[])() = {
    d_equrundef,                        // 50 .equrundef/.regundef
    d_ccundef,                  // 51 .ccundef
    d_print,                            // 52 .print
    d_equrundef,                        // 50 .equrundef/.regundef
    d_ccundef,                  // 51 .ccundef
    d_print,                            // 52 .print

-   d_gpumain,                  // 53 .gpumain
-   d_jpad,                             // 54 .jpad
-   d_nojpad,                   // 55 .nojpad
-   d_fail,                             // 56 .fail
+//   d_gpumain,                        // 53 .gpumain
+//   d_jpad,                           // 54 .jpad
+//   d_nojpad,                 // 55 .nojpad
+//   d_fail,                           // 56 .fail

 };
 
 
 };
 
 

-//
-// .fail - User abort
-//
-int d_fail(void)
-{
-       fatal("user abort");
-       return 0;
-}
-
-

 //
 // .org - Set origin
 //
 //
 // .org - Set origin
 //


@@ -121,23 +111,6 @@ int d_org(void)
 }
 
 
 }
 
 

-//
-// NOP Padding Directive
-//
-int d_jpad(void)
-{
-       jpad = 1;
-       return 0;
-}
-
-
-int d_nojpad(void)
-{
-       jpad = 0;
-       return 0;
-}
-
-

 //
 // Print Directive
 //
 //
 // Print Directive
 //


@@ -1236,7 +1209,7 @@ int d_nlist(void)
 int d_68000(void)
 {
        rgpu = rdsp = 0;
 int d_68000(void)
 {
        rgpu = rdsp = 0;

-       in_main = 0;
+//     in_main = 0;

        // Switching from gpu/dsp sections should reset any ORG'd Address
        orgactive = 0;                               
        orgwarning = 0;
        // Switching from gpu/dsp sections should reset any ORG'd Address
        orgactive = 0;                               
        orgwarning = 0;


@@ -1267,36 +1240,8 @@ int d_gpu(void)
        rgpu = 1;                                                // Set GPU assembly
        rdsp = 0;                                                // Unset DSP assembly
        regbank = BANK_N;                                        // Set no default register bank
        rgpu = 1;                                                // Set GPU assembly
        rdsp = 0;                                                // Unset DSP assembly
        regbank = BANK_N;                                        // Set no default register bank

-       in_main = 0;
-       jpad = 0;
-       return 0;
-}
-
-
-//
-// GPU Main Code Directive
-//
-
-int d_gpumain(void)
-{
-       if ((cursect != TEXT) && (cursect != DATA))
-       {
-               error(".gpumain can only be used in the TEXT or DATA segments");
-               return ERROR;
-       }
-
-       // If previous section was dsp or 68000 then we need to reset ORG'd Addresses
-       if (!rgpu)
-       {
-               orgactive = 0;
-               orgwarning = 0;
-       }
-
-       rgpu = 1;                                                // Set GPU assembly
-       rdsp = 0;                                                // Unset DSP assembly
-       regbank = BANK_N;                                        // Set no default register bank
-       in_main = 1;                                             // Enable main code execution rules
-       jpad = 0;
+//     in_main = 0;
+//     jpad = 0;

        return 0;
 }
 
        return 0;
 }
 


@@ -1322,8 +1267,8 @@ int d_dsp(void)
        rdsp = 1;                                                // Set DSP assembly
        rgpu = 0;                                                // Unset GPU assembly
        regbank = BANK_N;                                        // Set no default register bank
        rdsp = 1;                                                // Set DSP assembly
        rgpu = 0;                                                // Unset GPU assembly
        regbank = BANK_N;                                        // Set no default register bank

-       in_main = 0;
-       jpad = 0;
+//     in_main = 0;
+//     jpad = 0;

        return 0;
 }
 
        return 0;
 }
 

diff --git a/expr.c b/expr.c
index 1747c8441666c4d79815b9b11dd20609d027dbf8..23f6a14afcbb0c46561c101b6d0e43e382acbb56 100644 (file)
--- a/expr.c
+++ b/expr.c
@@ -328,12 +328,17 @@ int expr2(void)
 //
 int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 {
 //
 int expr(TOKEN * otk, VALUE * a_value, WORD * a_attr, SYM ** a_esym)
 {

+       // Passed in values (once derefenced, that is) can all be zero. They are
+       // there so that the expression analyzer can fill them in as needed. The
+       // expression analyzer gets its input from "tok", and not from anything
+       // passed in by the user.

        SYM * sy;
        char * p;
        int j;
 
        SYM * sy;
        char * p;
        int j;
 

-       tk = otk;                                                               // Set token pointer to 'exprbuf' (direct.c)
-//     symbolNum = 0;                                                  // Set symbol number in symbolPtr[] to 0
+       tk = otk;                       // Set token pointer to 'exprbuf' (direct.c)
+                                               // Also set in various other places too (risca.c, e.g.)
+//     symbolNum = 0;          // Set symbol number in symbolPtr[] to 0

 
        // Optimize for single constant or single symbol.
        if ((tok[1] == EOL)
 
        // Optimize for single constant or single symbol.
        if ((tok[1] == EOL)

diff --git a/macro.c b/macro.c
index e136c5a10145f86b1da550203aca567031372bde..3f3e81b82fe185d51606ee620711a57e224ab0ae 100644 (file)
--- a/macro.c
+++ b/macro.c
@@ -17,7 +17,7 @@
 #include "token.h"
 
 
 #include "token.h"
 
 

-static void SetupDefaultMacros(void);
+//static void SetupDefaultMacros(void);

 
 LONG curuniq;                                                          // Current macro's unique number
 //TOKEN ** argp;                                                               // Free spot in argptrs[]
 
 LONG curuniq;                                                          // Current macro's unique number
 //TOKEN ** argp;                                                               // Free spot in argptrs[]


@@ -44,7 +44,7 @@ void InitMacro(void)
        macnum = 1;
 //     argp = NULL;
        argp = 0;
        macnum = 1;
 //     argp = NULL;
        argp = 0;

-       SetupDefaultMacros();
+//     SetupDefaultMacros();

 }
 
 
 }
 
 


@@ -84,7 +84,7 @@ of another (nested macros). Need to fix that somehow.
        DEBUG printf("%d (nargs = %d)\n", argp, imacro->im_nargs);
 
        fpop();
        DEBUG printf("%d (nargs = %d)\n", argp, imacro->im_nargs);
 
        fpop();

-       mjump_align = 0;
+//     mjump_align = 0;

        return 0;
 }
 
        return 0;
 }
 


@@ -451,11 +451,13 @@ int InvokeMacro(SYM * mac, WORD siz)
 //     argp = 0;
        DEBUG printf("InvokeMacro: argp: %d -> ", argp);
 
 //     argp = 0;
        DEBUG printf("InvokeMacro: argp: %d -> ", argp);
 

+#if 0

        if ((!strcmp(mac->sname, "mjump") || !strcmp(mac->sname, "mpad")) && !in_main)
        {
                error("macro cannot be used outside of .gpumain");
                return ERROR;
        }
        if ((!strcmp(mac->sname, "mjump") || !strcmp(mac->sname, "mpad")) && !in_main)
        {
                error("macro cannot be used outside of .gpumain");
                return ERROR;
        }

+#endif

 
        INOBJ * inobj = a_inobj(SRC_IMACRO);            // Alloc and init IMACRO 
        IMACRO * imacro = inobj->inobj.imacro;
 
        INOBJ * inobj = a_inobj(SRC_IMACRO);            // Alloc and init IMACRO 
        IMACRO * imacro = inobj->inobj.imacro;


@@ -624,6 +626,7 @@ alleviate this problem.]
 }
 
 
 }
 
 

+#if 0

 //
 // Setup inbuilt macros (SubQMod)
 //
 //
 // Setup inbuilt macros (SubQMod)
 //


@@ -667,3 +670,4 @@ static void SetupDefaultMacros(void)
        defmac1("     nop", -1);
        defmac1("  .endr", -1);
 }
        defmac1("     nop", -1);
        defmac1("  .endr", -1);
 }

+#endif

diff --git a/macro.h b/macro.h
index 81aba9483d1212809456603a5afc72041e1ca121..9b45c5b0662b3d0d4e78df2eaac420e061a7f552 100644 (file)
--- a/macro.h
+++ b/macro.h
@@ -14,7 +14,7 @@
 // Globals, externals etc
 extern LONG curuniq;
 //extern TOKEN ** argp;
 // Globals, externals etc
 extern LONG curuniq;
 //extern TOKEN ** argp;

-extern int mjump_align;
+//extern int mjump_align;

 extern TOKEN * argPtrs[];
 
 // Prototypes
 extern TOKEN * argPtrs[];
 
 // Prototypes

diff --git a/mntab b/mntab
index 1ba0247329e85058752b915370fc9adffa456c16..812c882ab1e7ddd5e073d23d8d9535976f47d686 100644 (file)
--- a/mntab
+++ b/mntab
@@ -87,13 +87,6 @@ regundef 50
 ccundef  51
 .print 52
 print  52
 ccundef  51
 .print 52
 print  52

-.gpumain 53
-.jpad 54
-jpad  54
-.nojpad  55
-nojpad   55
-.fail 56
-fail  56 

 .if    500
 if     500
 .else  501
 .if    500
 if     500
 .else  501

diff --git a/object.c b/object.c
index 8951b795206435aec15064be4d30b406704059d7..c2b8d53c9910de64d581de05b27ec02d4f822e71 100644 (file)
--- a/object.c
+++ b/object.c
@@ -84,7 +84,7 @@ int object(WORD fd)
        LONG tds;                                                               // TEXT & DATA segment size
        int i;                                                                  // Temporary int
        CHUNK * cp;                                                             // Chunk (for gather)
        LONG tds;                                                               // TEXT & DATA segment size
        int i;                                                                  // Temporary int
        CHUNK * cp;                                                             // Chunk (for gather)

-       char * buf;=                                                    // Scratch area
+       char * buf;                                                             // Scratch area

        char * p;                                                               // Temporary ptr
        LONG ssize;                                                             // Size of symbols
        LONG trsize, drsize;                                    // Size of relocations
        char * p;                                                               // Temporary ptr
        LONG ssize;                                                             // Size of symbols
        LONG trsize, drsize;                                    // Size of relocations

diff --git a/risca.c b/risca.c
index a7d50ccdabb371e409464da9633603ef39efe527..7786beb2de447fd6a00420e9e8e704834e680721 100644 (file)
--- a/risca.c
+++ b/risca.c
@@ -25,10 +25,8 @@ unsigned altbankok = 0;                                      // Ok to use alternate register bank
 unsigned orgactive = 0;                                        // RISC org directive active
 unsigned orgaddr = 0;                                  // Org'd address
 unsigned orgwarning = 0;                               // Has an ORG warning been issued
 unsigned orgactive = 0;                                        // RISC org directive active
 unsigned orgaddr = 0;                                  // Org'd address
 unsigned orgwarning = 0;                               // Has an ORG warning been issued

-int jpad = 0;
-unsigned previousop = 0;                               // Used for NOP padding checks
-unsigned currentop = 0;                                        // Used for NOP padding checks
-unsigned mjump_defined, mjump_dest;            // mjump macro flags, values etc
+//unsigned previousop = 0;                             // Used for NOP padding checks
+//unsigned currentop = 0;                                      // Used for NOP padding checks

 
 char reg_err[] = "missing register R0...R31";
 
 
 char reg_err[] = "missing register R0...R31";
 


@@ -40,8 +38,8 @@ char condname[MAXINTERNCC][5] = {
 };
 
 // Jaguar Jump Condition Numbers
 };
 
 // Jaguar Jump Condition Numbers

-char condnumber[] = {1, 2, 4, 5, 6, 8, 9, 10, 20, 21, 22, 24, 25, 26,
-                     0, 0, 1, 2, 4, 4, 5,  8,  8, 20, 24, 31};
+char condnumber[] = { 1, 2, 4, 5, 6, 8, 9, 10, 20, 21, 22, 24, 25, 26,
+                      0, 0, 1, 2, 4, 4, 5,  8,  8, 20, 24, 31};

 
 struct opcoderecord roptbl[] = {
        { MR_ADD,     RI_TWO,    0 },
 
 struct opcoderecord roptbl[] = {
        { MR_ADD,     RI_TWO,    0 },


@@ -127,20 +125,23 @@ void strtoupper(char * s)
 //
 void risc_instruction_word(unsigned short parm, int reg1, int reg2)
 {
 //
 void risc_instruction_word(unsigned short parm, int reg1, int reg2)
 {

-       int value = 0xE400;
+//     int value = 0xE400;

 
 

-       previousop = currentop;                                  // Opcode tracking for nop padding
-       currentop = parm;
+       // Opcode tracking for nop padding
+//     previousop = currentop;
+//     currentop = parm;

 
 

-       if (!orgwarning)
-       {                                        // Check for absolute address setting
-               if (!orgactive && !in_main)
-               {
+       if (!orgwarning && !orgactive)
+       {
+               // Check for absolute address setting
+//             if (!orgactive && !in_main)
+//             {

                        warn("GPU/DSP code outside of absolute section");
                        orgwarning = 1;
                        warn("GPU/DSP code outside of absolute section");
                        orgwarning = 1;

-               }
+//             }

        }
 
        }
 

+#if 0

        if (jpad)
        {                                               // JPAD directive
                //                JUMP                   JR                    NOP
        if (jpad)
        {                                               // JPAD directive
                //                JUMP                   JR                    NOP


@@ -148,7 +149,7 @@ void risc_instruction_word(unsigned short parm, int reg1, int reg2)
                        D_word(value);                                     // Insert NOP
        }
        else
                        D_word(value);                                     // Insert NOP
        }
        else

-       {
+//     {

                //               JUMP                   JR
                if ((previousop == 52) || (previousop == 53))
                {
                //               JUMP                   JR
                if ((previousop == 52) || (previousop == 53))
                {


@@ -174,25 +175,22 @@ void risc_instruction_word(unsigned short parm, int reg1, int reg2)
                                break;
                        }
                }
                                break;
                        }
                }

-       }
+//     }

 
        if (currentop == 20)
        {                                    // IMACN checks
                if ((previousop != 18) && (previousop != 20))
 
        if (currentop == 20)
        {                                    // IMACN checks
                if ((previousop != 18) && (previousop != 20))

-               {

                        error("IMULTN/IMACN instruction must preceed IMACN instruction");
                        error("IMULTN/IMACN instruction must preceed IMACN instruction");

-               }

        }
 
        if (currentop == 19)
        {                                    // RESMAC checks
                if (previousop != 20)
        }
 
        if (currentop == 19)
        {                                    // RESMAC checks
                if (previousop != 20)

-               {

                        error("IMACN instruction must preceed RESMAC instruction");
                        error("IMACN instruction must preceed RESMAC instruction");

-               }

        }
        }

+#endif

 
 

-       value =((parm & 0x3F) << 10) + ((reg1 & 0x1F) << 5) + (reg2 & 0x1F);
+       int value = ((parm & 0x3F) << 10) + ((reg1 & 0x1F) << 5) + (reg2 & 0x1F);

        D_word(value);
 }
 
        D_word(value);
 }
 


@@ -206,40 +204,29 @@ int getregister(WORD rattr)
        WORD eattr;                                     // Expression attributes
        SYM * esym;                                     // External symbol involved in expr.
        TOKEN r_expr[EXPRSIZE];         // Expression token list
        WORD eattr;                                     // Expression attributes
        SYM * esym;                                     // External symbol involved in expr.
        TOKEN r_expr[EXPRSIZE];         // Expression token list

-       WORD defined;                           // Symbol defined flag

 
 

+       // Evaluate what's in the global "tok" buffer

        if (expr(r_expr, &eval, &eattr, &esym) != OK)
        {
        if (expr(r_expr, &eval, &eattr, &esym) != OK)
        {

-               error("malformed opcode");
+               error("Malformed opcode");

                return ERROR;
        }
                return ERROR;
        }

-       else
-       {
-               defined = (WORD)(eattr & DEFINED);

 
 

-               if ((challoc - ch_size) < 4)
-                       chcheck(4L);
+       if ((challoc - ch_size) < 4)
+               chcheck(4L);

 
 

-               if (!defined)
-               {
-                       fixup((WORD)(FU_WORD|rattr), sloc, r_expr);      
-                       return 0;
-               }
-               else
-               {
-                       // Check for specified register, r0->r31
-                       if ((eval >= 0) && (eval <= 31))
-                       {
-                               return eval;
-                       }
-                       else
-                       {
-                               error(reg_err);
-                               return ERROR;
-                       }
-               }
+       if (!(eattr & DEFINED))
+       {
+               fixup((WORD)(FU_WORD | rattr), sloc, r_expr);      
+               return 0;

        }
 
        }
 

+       // If we got a register in range (0-31), return it
+       if ((eval >= 0) && (eval <= 31))
+               return eval;
+
+       // Otherwise, it's out of range & we flag an error
+       error(reg_err);

        return ERROR;
 }
 
        return ERROR;
 }
 


@@ -249,36 +236,37 @@ int getregister(WORD rattr)
 //
 int risccg(int state)
 {
 //
 int risccg(int state)
 {

-       unsigned short parm;                                    // Opcode parameters
-       unsigned type;                                                  // Opcode type
-       int reg1;                                                               // Register 1
-       int reg2;                                                               // Register 2
-       int val = 0;                                                    // Constructed value
+//     unsigned short parm;            // Opcode parameters
+//     unsigned type;                          // Opcode type
+       int reg1;                                       // Register 1
+       int reg2;                                       // Register 2
+       int val = 0;                            // Constructed value

        char scratch[80];
        SYM * ccsym;
        SYM * sy;
        char scratch[80];
        SYM * ccsym;
        SYM * sy;

-       int i;                                                                  // Iterator
+       int i;                                          // Iterator

        int t, c;
        WORD tdb;
        int t, c;
        WORD tdb;

-       unsigned locptr = 0;                                    // Address location pointer
-       unsigned page_jump = 0;                                 // Memory page jump flag
-       VALUE eval;                                                             // Expression value
-       WORD eattr;                                                             // Expression attributes
-       SYM * esym;                                                             // External symbol involved in expr.
-       TOKEN r_expr[EXPRSIZE];                                 // Expression token list
-       WORD defined;                                                   // Symbol defined flag
+       unsigned locptr = 0;            // Address location pointer
+       unsigned page_jump = 0;         // Memory page jump flag
+       VALUE eval;                                     // Expression value
+       WORD eattr;                                     // Expression attributes
+       SYM * esym;                                     // External symbol involved in expr.
+       TOKEN r_expr[EXPRSIZE];         // Expression token list
+       WORD defined;                           // Symbol defined flag

        WORD attrflg;
        WORD attrflg;

-       int indexed;                                                    // Indexed register flag
+       int indexed;                            // Indexed register flag

 
 

-       parm = (WORD)(roptbl[state-3000].parm); // Get opcode parameter and type
-       type = roptbl[state-3000].typ;
+       // Get opcode parameter and type
+       unsigned short parm = (WORD)(roptbl[state - 3000].parm);
+       unsigned type = roptbl[state - 3000].typ;

 
        // Detect whether the opcode parmeter passed determines that the opcode is
        // specific to only one of the RISC processors and ensure it is legal in
        // the current code section. If not then error and return.
        if (((parm & GPUONLY) && rdsp) || ((parm & DSPONLY) && rgpu))
        {
 
        // Detect whether the opcode parmeter passed determines that the opcode is
        // specific to only one of the RISC processors and ensure it is legal in
        // the current code section. If not then error and return.
        if (((parm & GPUONLY) && rdsp) || ((parm & DSPONLY) && rgpu))
        {

-               error("opcode is not valid in this code section");
+               error("Opcode is not valid in this code section");

                return ERROR;
        }
 
                return ERROR;
        }
 


@@ -290,6 +278,7 @@ int risccg(int state)
        case RI_NONE: 
                risc_instruction_word(parm, 0, 0);
                break;
        case RI_NONE: 
                risc_instruction_word(parm, 0, 0);
                break;

+

        // Single operand instructions (Rd)
        // ABS, MIRROR, NEG, NOT, PACK, RESMAC, SAT8, SAT16, SAT16S, SAT24, SAT32S, UNPACK
        case RI_ONE:
        // Single operand instructions (Rd)
        // ABS, MIRROR, NEG, NOT, PACK, RESMAC, SAT8, SAT16, SAT16S, SAT24, SAT32S, UNPACK
        case RI_ONE:


@@ -297,6 +286,7 @@ int risccg(int state)
                at_eol();
                risc_instruction_word(parm, parm >> 6, reg2);
                break;   
                at_eol();
                risc_instruction_word(parm, parm >> 6, reg2);
                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
        // 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


@@ -314,12 +304,15 @@ int risccg(int state)
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;

+

        // Numeric operand (n,Rd) where n = -16..+15
        // CMPQ
        case RI_NUM_15:                   
        // Numeric operand (n,Rd) where n = -16..+15
        // CMPQ
        case RI_NUM_15:                   

+

        // Numeric operand (n,Rd) where n = 0..31
        // BCLR, BSET, BTST, MOVEQ
        case RI_NUM_31:      
        // Numeric operand (n,Rd) where n = 0..31
        // BCLR, BSET, BTST, MOVEQ
        case RI_NUM_31:      

+

        // Numeric operand (n,Rd) where n = 1..32
        // ADDQ, ADDQMOD, ADDQT, SHARQ, SHLQ, SHRQ, SUBQ, SUBQMOD, SUBQT, ROLQ, RORQ
        case RI_NUM_32:                   
        // Numeric operand (n,Rd) where n = 1..32
        // ADDQ, ADDQMOD, ADDQT, SHARQ, SHLQ, SHRQ, SUBQ, SUBQMOD, SUBQT, ROLQ, RORQ
        case RI_NUM_32:                   


@@ -341,7 +334,7 @@ int risccg(int state)
                {
                        if (*tok == '#')
                        {
                {
                        if (*tok == '#')
                        {

-                               ++tok;
+                               tok++;

 
                                if (expr(r_expr, &eval, &eattr, &esym) != OK)
                                        goto malformed;
 
                                if (expr(r_expr, &eval, &eattr, &esym) != OK)
                                        goto malformed;


@@ -354,7 +347,7 @@ int risccg(int state)
 
                                        if (!defined)
                                        {
 
                                        if (!defined)
                                        {

-                                               fixup((WORD)(FU_WORD|attrflg), sloc, r_expr);
+                                               fixup((WORD)(FU_WORD | attrflg), sloc, r_expr);

                                                reg1 = 0;
                                        }
                                        else
                                                reg1 = 0;
                                        }
                                        else


@@ -368,7 +361,7 @@ int risccg(int state)
                                                if (parm & SUB32) 
                                                        reg1 = 32 - eval; 
                                                else if (type == RI_NUM_32)
                                                if (parm & SUB32) 
                                                        reg1 = 32 - eval; 
                                                else if (type == RI_NUM_32)

-                                                       reg1 = (reg1 == 32) ? 0 : eval;
+                                                       reg1 = (reg1 == 32 ? 0 : eval);

                                                else
                                                        reg1 = eval;
                                        }
                                                else
                                                        reg1 = eval;
                                        }


@@ -383,11 +376,15 @@ int risccg(int state)
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;

-       // Move Immediate - n,Rn - n in Second Word
-       case RI_MOVEI:       
-               if (*tok == '#')
-               {
-                       ++tok;
+
+       // Move Immediate--n,Rn--n in Second Word
+       case RI_MOVEI:
+               if (*tok != '#')
+                       goto malformed;
+
+//             {
+                       tok++;
+

                        if (expr(r_expr, &eval, &eattr, &esym) != OK)
                        {
                                malformed:
                        if (expr(r_expr, &eval, &eattr, &esym) != OK)
                        {
                                malformed:


@@ -397,15 +394,17 @@ int risccg(int state)
                        else
                        {
                                // Opcode tracking for nop padding
                        else
                        {
                                // Opcode tracking for nop padding

-                               previousop = currentop;                          
-                               currentop = parm;
+//                             previousop = currentop;                          
+//                             currentop = parm;

 
 

+#if 0

                                // JUMP or JR
                                if ((previousop == 52) || (previousop == 53) && !jpad)
                                {
                                        warn("NOP inserted before MOVEI instruction.");   
                                        D_word(0xE400);
                                }
                                // JUMP or JR
                                if ((previousop == 52) || (previousop == 53) && !jpad)
                                {
                                        warn("NOP inserted before MOVEI instruction.");   
                                        D_word(0xE400);
                                }

+#endif

 
                                tdb = (WORD)(eattr & TDB);
                                defined = (WORD)(eattr & DEFINED);
 
                                tdb = (WORD)(eattr & TDB);
                                defined = (WORD)(eattr & DEFINED);


@@ -415,37 +414,38 @@ int risccg(int state)
 
                                if (!defined)
                                {
 
                                if (!defined)
                                {

-                                       fixup(FU_LONG|FU_MOVEI, sloc + 2, r_expr);
+                                       fixup(FU_LONG | FU_MOVEI, sloc + 2, r_expr);

                                        eval = 0;
                                }
                                else
                                {
                                        if (tdb)
                                        eval = 0;
                                }
                                else
                                {
                                        if (tdb)

-                                       {
-                                               rmark(cursect, sloc + 2, tdb, MLONG|MMOVEI, NULL);
-                                       }
+                                               rmark(cursect, sloc + 2, tdb, MLONG | MMOVEI, NULL);

                                }       
 
                                val = eval;
 
                                }       
 
                                val = eval;
 

+#if 0

                                // Store the defined flags and value of the movei when used in mjump
                                if (mjump_align)
                                {
                                        mjump_defined = defined;
                                        mjump_dest = val;
                                }
                                // Store the defined flags and value of the movei when used in mjump
                                if (mjump_align)
                                {
                                        mjump_defined = defined;
                                        mjump_dest = val;
                                }

+#endif

                        }
                        }

-               }
-               else
-                       goto malformed;
+//             }
+//             else
+//                     goto malformed;

 
 

-               ++tok;
+               tok++;

                reg2 = getregister(FU_REGTWO);
                at_eol();
                D_word((((parm & 0x3F) << 10) + reg2));
                val = ((val >> 16) & 0x0000FFFF) | ((val << 16) & 0xFFFF0000);
                D_long(val);
                break;
                reg2 = getregister(FU_REGTWO);
                at_eol();
                D_word((((parm & 0x3F) << 10) + reg2));
                val = ((val >> 16) & 0x0000FFFF) | ((val << 16) & 0xFFFF0000);
                D_long(val);
                break;

+

        case RI_MOVE:                     // PC,Rd or Rs,Rd
                if (*tok == KW_PC)
                {
        case RI_MOVE:                     // PC,Rd or Rs,Rd
                if (*tok == KW_PC)
                {


@@ -464,6 +464,7 @@ int risccg(int state)
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;

+

        // (Rn),Rn = 41 / (R14/R15+n),Rn = 43/44 / (R14/R15+Rn),Rn = 58/59
        case RI_LOAD:          
                indexed = 0;
        // (Rn),Rn = 41 / (R14/R15+n),Rn = 43/44 / (R14/R15+Rn),Rn = 58/59
        case RI_LOAD:          
                indexed = 0;


@@ -597,12 +598,13 @@ int risccg(int state)
                if (*tok != ')')
                        goto malformed;
 
                if (*tok != ')')
                        goto malformed;
 

-               ++tok;
+               tok++;

                CHECK_COMMA;
                reg2 = getregister(FU_REGTWO);
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;
                CHECK_COMMA;
                reg2 = getregister(FU_REGTWO);
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;

+

        // Rn,(Rn) = 47 / Rn,(R14/R15+n) = 49/50 / Rn,(R14/R15+Rn) = 60/61
        case RI_STORE:    
                parm = 47;
        // Rn,(Rn) = 47 / Rn,(R14/R15+n) = 49/50 / Rn,(R14/R15+Rn) = 60/61
        case RI_STORE:    
                parm = 47;


@@ -611,10 +613,10 @@ int risccg(int state)
 
                if (*tok != '(') goto malformed;
 
 
                if (*tok != '(') goto malformed;
 

-               ++tok;
+               tok++;

                indexed = 0;
 
                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)
                        indexed = (*tok - KW_R0);
 
                if (*tok == SYMBOL)


@@ -631,10 +633,10 @@ int risccg(int state)
                        if (sy->sattre & EQUATEDREG) 
                        {
                                if (((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15)
                        if (sy->sattre & EQUATEDREG) 
                        {
                                if (((sy->svalue & 0x1F) == 14 || (sy->svalue & 0x1F) == 15)

-                                       && (*(tok+2) != ')'))
+                                       && (*(tok + 2) != ')'))

                                {
                                        indexed = (sy->svalue & 0x1F);
                                {
                                        indexed = (sy->svalue & 0x1F);

-                                       ++tok;
+                                       tok++;

                                }
                        }
                }
                                }
                        }
                }


@@ -647,7 +649,7 @@ int risccg(int state)
                {
                        reg2 = indexed;
                        indexed = 0;
                {
                        reg2 = indexed;
                        indexed = 0;

-                       ++tok;
+                       tok++;

 
                        if (*tok == '+')
                        {
 
                        if (*tok == '+')
                        {


@@ -696,7 +698,7 @@ int risccg(int state)
 
                                                if (!defined)
                                                {
 
                                                if (!defined)
                                                {

-                                                       fixup(FU_WORD|FU_REGTWO, sloc, r_expr);
+                                                       fixup(FU_WORD | FU_REGTWO, sloc, r_expr);

                                                        reg2 = 0;
                                                }
                                                else
                                                        reg2 = 0;
                                                }
                                                else


@@ -735,27 +737,29 @@ int risccg(int state)
                if (*tok != ')')
                        goto malformed;
 
                if (*tok != ')')
                        goto malformed;
 

-               ++tok;
+               tok++;

                at_eol();
                risc_instruction_word(parm, reg2, reg1);
                break;
                at_eol();
                risc_instruction_word(parm, reg2, reg1);
                break;

+

        // LOADB/LOADP/LOADW (Rn),Rn
        case RI_LOADN:                    
                if (*tok != '(')
                        goto malformed;
 
        // LOADB/LOADP/LOADW (Rn),Rn
        case RI_LOADN:                    
                if (*tok != '(')
                        goto malformed;
 

-               ++tok;
+               tok++;

                reg1 = getregister(FU_REGONE);
 
                if (*tok != ')')
                        goto malformed;
 
                reg1 = getregister(FU_REGONE);
 
                if (*tok != ')')
                        goto malformed;
 

-               ++tok;
+               tok++;

                CHECK_COMMA;
                reg2 = getregister(FU_REGTWO);
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;
                CHECK_COMMA;
                reg2 = getregister(FU_REGTWO);
                at_eol();
                risc_instruction_word(parm, reg1, reg2);
                break;

+

        // STOREB/STOREP/STOREW Rn,(Rn)
        case RI_STOREN:                   
                reg1 = getregister(FU_REGONE);
        // STOREB/STOREP/STOREW Rn,(Rn)
        case RI_STOREN:                   
                reg1 = getregister(FU_REGONE);


@@ -764,51 +768,62 @@ int risccg(int state)
                if (*tok != '(')
                        goto malformed;
 
                if (*tok != '(')
                        goto malformed;
 

-               ++tok;
+               tok++;

                reg2 = getregister(FU_REGTWO);
 
                if (*tok != ')')
                        goto malformed;
 
                reg2 = getregister(FU_REGTWO);
 
                if (*tok != ')')
                        goto malformed;
 

-               ++tok;
+               tok++;

                at_eol();
                risc_instruction_word(parm, reg2, reg1);
                break;
                at_eol();
                risc_instruction_word(parm, reg2, reg1);
                break;

+

        case RI_JR:                       // Jump Relative - cc,n - n=-16..+15 words, reg2=cc
        case RI_JUMP:                     // Jump Absolute - cc,(Rs) - reg2=cc
        case RI_JR:                       // Jump Relative - cc,n - n=-16..+15 words, reg2=cc
        case RI_JUMP:                     // Jump Absolute - cc,(Rs) - reg2=cc

-               // Check to see if there is a comma in the token string. If not then the JR or JUMP should
-               // default to 0, Jump Always
+               // Check to see if there is a comma in the token string. If not then
+               // the JR or JUMP should default to 0, Jump Always

                t = i = c = 0;
                t = i = c = 0;

+

                while (t != EOL)
                {
                        t = *(tok + i);
                while (t != EOL)
                {
                        t = *(tok + i);

-                       if (t == ',') c = 1;
+
+                       if (t == ',')
+                               c = 1;
+

                        i++;
                }
 
                if (c)
                        i++;
                }
 
                if (c)

-               {                                            // Comma present in token string
+               {
+                       // Comma present in token string

                        if (*tok == CONST)
                        if (*tok == CONST)

-                       {                             // CC using a constant number
-                               ++tok;
+                       {
+                               // CC using a constant number
+                               tok++;

                                val = *tok;
                                val = *tok;

-                               ++tok;
+                               tok++;

                                CHECK_COMMA;
                        }
                        else if (*tok == SYMBOL)
                        {
                                val = 99;
                                CHECK_COMMA;
                        }
                        else if (*tok == SYMBOL)
                        {
                                val = 99;

+//                             strcpy(scratch, (char *)tok[1]);
+                               strcpy(scratch, string[tok[1]]);
+                               strtoupper(scratch);

 
                                for(i=0; i<MAXINTERNCC; i++)
                                {
 
                                for(i=0; i<MAXINTERNCC; i++)
                                {

-//                                     strcpy(scratch, (char *)tok[1]);
-                                       strcpy(scratch, string[tok[1]]);
-                                       strtoupper(scratch);
-
-                                       if (!strcmp(condname[i], scratch)) 
+                                       // Look for the condition code & break if found
+                                       if (strcmp(condname[i], scratch) == 0)
+                                       {

                                                val = condnumber[i];
                                                val = condnumber[i];

+                                               break;
+                                       }

                                }
 
                                }
 

+                               // Standard CC was not found, look for an equated one

                                if (val == 99)
                                {
 //                                     ccsym = lookup((char *)tok[1], LABEL, 0);
                                if (val == 99)
                                {
 //                                     ccsym = lookup((char *)tok[1], LABEL, 0);


@@ -830,12 +845,14 @@ int risccg(int state)
                        }
                        else if (*tok == '(')
                        {
                        }
                        else if (*tok == '(')
                        {

-                               val = 0;                                     // Jump always
+                               // Jump always
+                               val = 0;

                        }
                }
                else
                {
                        }
                }
                else
                {

-                       val = 0;                                        // Jump always
+                       // Jump always
+                       val = 0;

                }
 
                if (val < 0 || val > 31)
                }
 
                if (val < 0 || val > 31)


@@ -845,11 +862,13 @@ int risccg(int state)
                }
                else
                {
                }
                else
                {

-                       reg1 = val;                                     // Store condition code
+                       // Store condition code
+                       reg1 = val;

                }
 
                if (type == RI_JR)
                }
 
                if (type == RI_JR)

-               {                                // JR cc,n
+               {
+                       // JR cc,n

                        if (expr(r_expr, &eval, &eattr, &esym) != OK)
                                goto malformed;
                        else
                        if (expr(r_expr, &eval, &eattr, &esym) != OK)
                                goto malformed;
                        else


@@ -862,14 +881,16 @@ int risccg(int state)
 
                                if (!defined)
                                {
 
                                if (!defined)
                                {

+#if 0

                                        if (in_main)
                                        {
                                                fixup(FU_WORD|FU_MJR, sloc, r_expr);
                                        }
                                        else
                                        if (in_main)
                                        {
                                                fixup(FU_WORD|FU_MJR, sloc, r_expr);
                                        }
                                        else

-                                       {
-                                               fixup(FU_WORD|FU_JR, sloc, r_expr);
-                                       }
+#endif
+//                                     {
+                                               fixup(FU_WORD | FU_JR, sloc, r_expr);
+//                                     }

 
                                        reg2 = 0;
                                }
 
                                        reg2 = 0;
                                }


@@ -880,19 +901,24 @@ int risccg(int state)
                                        if (orgactive)
                                        {
                                                reg2 = ((int)(val - (orgaddr + 2))) / 2;
                                        if (orgactive)
                                        {
                                                reg2 = ((int)(val - (orgaddr + 2))) / 2;

+

                                                if ((reg2 < -16) || (reg2 > 15))
                                                if ((reg2 < -16) || (reg2 > 15))

-                                               error("PC relative overflow");
+                                                       error("PC relative overflow");
+

                                                locptr = orgaddr;
                                        }
                                        else
                                        {
                                                reg2 = ((int)(val - (sloc + 2))) / 2;
                                                locptr = orgaddr;
                                        }
                                        else
                                        {
                                                reg2 = ((int)(val - (sloc + 2))) / 2;

+

                                                if ((reg2 < -16) || (reg2 > 15))
                                                if ((reg2 < -16) || (reg2 > 15))

-                                               error("PC relative overflow");
+                                                       error("PC relative overflow");
+

                                                locptr = sloc;
                                        }
                                }       
 
                                                locptr = sloc;
                                        }
                                }       
 

+#if 0

                                if (in_main)
                                {
                                        if (defined)
                                if (in_main)
                                {
                                        if (defined)


@@ -926,24 +952,27 @@ int risccg(int state)
                                                }
                                        }
                                }
                                                }
                                        }
                                }

+#endif

                        }
 
                        risc_instruction_word(parm, reg2, reg1);
                }
                else
                        }
 
                        risc_instruction_word(parm, reg2, reg1);
                }
                else

-               {                                           // JUMP cc, (Rn)
+               {
+                       // JUMP cc, (Rn)

                        if (*tok != '(')
                                goto malformed;
 
                        if (*tok != '(')
                                goto malformed;
 

-                       ++tok;
+                       tok++;

                        reg2 = getregister(FU_REGTWO);
 
                        if (*tok != ')')
                                goto malformed;
 
                        reg2 = getregister(FU_REGTWO);
 
                        if (*tok != ')')
                                goto malformed;
 

-                       ++tok;
+                       tok++;

                        at_eol();
 
                        at_eol();
 

+#if 0

                        if (in_main)
                        {
                                if (!mjump_align)
                        if (in_main)
                        {
                                if (!mjump_align)


@@ -989,6 +1018,7 @@ int risccg(int state)
                                        }
                                }
                        }
                                        }
                                }
                        }

+#endif

 
                        risc_instruction_word(parm, reg2, reg1);
                }
 
                        risc_instruction_word(parm, reg2, reg1);
                }


@@ -1003,3 +1033,4 @@ int risccg(int state)
 
        return 0;
 }
 
        return 0;
 }

+

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"
 
 #include "rmac.h"
 #include "procln.h"
 

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

 
 // RISC Instruction Types
 
 // 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
 
 // 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 {
 
 #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
 };
 
 // Globals, externals etc


@@ -50,7 +50,7 @@ extern unsigned orgactive;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;
 extern unsigned orgaddr;
 extern unsigned orgwarning;
 extern unsigned altbankok;

-extern int jpad;
+//extern int jpad;

 
 // Prototypes
 int risccg(int);
 
 // Prototypes
 int risccg(int);

diff --git a/rmac.c b/rmac.c
index 7239af2b622bb5d872b8e597ca4a0e544f662eed..9d7522d93eea7e7eb50d90606790acd8b4958e8d 100644 (file)
--- a/rmac.c
+++ b/rmac.c
@@ -37,7 +37,7 @@ int rgpu, rdsp;                                               // Assembling Jaguar GPU or DSP code
 int list_fd;                                           // File to write listing to
 int regbank;                                           // RISC register bank
 int segpadsize;                                                // Segment padding size
 int list_fd;                                           // File to write listing to
 int regbank;                                           // RISC register bank
 int segpadsize;                                                // Segment padding size

-int in_main;                                           // In main memory flag for GPUMAIN
+//int in_main;                                         // In main memory flag for GPUMAIN

 int endian;                                                    // Host processor endianess
 char * objfname;                                       // Object filename pointer
 char * firstfname;                                     // First source filename
 int endian;                                                    // Host processor endianess
 char * objfname;                                       // Object filename pointer
 char * firstfname;                                     // First source filename


@@ -560,7 +560,7 @@ int process(int argc, char ** argv)
        orgwarning = 0;                                 // No ORG warning issued
        a_amount = 0;
        segpadsize = 2;                                 // Initialise segment padding size
        orgwarning = 0;                                 // No ORG warning issued
        a_amount = 0;
        segpadsize = 2;                                 // Initialise segment padding size

-       in_main = 0;
+//     in_main = 0;

 
        // Initialise modules
        InitSymbolTable();                              // Symbol table
 
        // Initialise modules
        InitSymbolTable();                              // Symbol table

diff --git a/rmac.h b/rmac.h
index ca43ea4edd00c27a28acf52a12d2892510db82c0..822b4d2bda12925033ad5793f41e46294bb0aa67 100644 (file)
--- a/rmac.h
+++ b/rmac.h
@@ -183,7 +183,7 @@ extern int lsym_flag;
 extern int sbra_flag;
 extern int obj_format;
 extern LONG amemtot;
 extern int sbra_flag;
 extern int obj_format;
 extern LONG amemtot;

-extern int in_main;
+//extern int in_main;

 
 // Prototypes
 void init_sym(void);
 
 // Prototypes
 void init_sym(void);

diff --git a/version.h b/version.h
index b1d085761e2f72946bdaed55187ea6127eeaeb52..cf7f39cb052812c01aabaf22427fad12a4e99327 100644 (file)
--- a/version.h
+++ b/version.h
@@ -12,7 +12,7 @@
 // Release Information
 
 #define MAJOR   1                      // Major version number
 // Release Information
 
 #define MAJOR   1                      // Major version number

-#define MINOR   1                      // Minor version number
-#define PATCH   3                      // Patch release number
+#define MINOR   2                      // Minor version number
+#define PATCH   0                      // Patch release number

 
 #endif // __VERSION_H__
 
 #endif // __VERSION_H__