Fix for slow .incbin performance.

[rmac] / risca.c

diff --git a/risca.c b/risca.c
index 4d0aa2957564a93421f05b25e086b5d44004bf3a..472e4f1e3d1da6b068b0f55959c01bebb53a6b60 100644 (file)
--- a/risca.c
+++ b/risca.c
@@ -200,7 +200,6 @@ int GenerateRISCCode(int state)
        SYM * sy;
        int i, commaFound;
        TOKEN * t;
-       WORD tdb;
        WORD attrflg;
        int indexed;                            // Indexed register flag
 
@@ -344,12 +343,13 @@ int GenerateRISCCode(int state)
                else
                {
                        if (eattr & TDB)
-                               rmark(cursect, sloc + 2, tdb, MLONG | MMOVEI, NULL);
-               }       
+//{
+//printf("risca: Doing rmark for RI_MOVEI (tdb=$%X)...\n", eattr & TDB);
+                               rmark(cursect, sloc + 2, (eattr & TDB), (MLONG | MMOVEI), NULL);
+//}
+               }
 
-//             val = eval;
                val = ((eval >> 16) & 0x0000FFFF) | ((eval << 16) & 0xFFFF0000);
-//             tok++;  // assuming a comma here? tsk tsk
                CHECK_COMMA;
                reg2 = GetRegister(FU_REGTWO);
                at_eol();
@@ -768,16 +768,7 @@ int GenerateRISCCode(int state)
                        }
                        else
                        {
-#if 0
-                               val = eval;
-
-                               if (orgactive)
-                                       reg2 = ((int)(val - (orgaddr + 2))) / 2;
-                               else
-                                       reg2 = ((int)(val - (sloc + 2))) / 2;
-#else
                                reg2 = ((int)(eval - ((orgactive ? orgaddr : sloc) + 2))) / 2;
-#endif
 
                                if ((reg2 < -16) || (reg2 > 15))
                                        error("PC relative overflow");