]> Shamusworld >> Repos - rmac/commitdiff
Don't print bogus message about optimising long address if it's suffixed with .l...
authorggn <ggn.dbug@gmail.com>
Wed, 16 May 2018 12:55:13 +0000 (15:55 +0300)
committerShamus Hammons <jlhamm@acm.org>
Wed, 16 May 2018 13:35:18 +0000 (08:35 -0500)
parmode.h
version.h

index 690b6168d0b5752d00e8accfcb39b82a7a57025c..4d37cdbe34ee77b4cad744e708e3d95f5e271e5a 100644 (file)
--- a/parmode.h
+++ b/parmode.h
@@ -1169,24 +1169,26 @@ CHK_FOR_DISPn:
                        // expr[.L]
                        AMn = ABSL;
 
                        // expr[.L]
                        AMn = ABSL;
 
-                       // Defined, absolute values from $FFFF8000..$00007FFF get optimized
-                       // to absolute short
-                       if (CHECK_OPTS(OPT_ABS_SHORT)
-                               && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
-                               && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
-                       {
-                               AMn = ABSW;
-
-                               if (sbra_flag)
-                                       warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short");
-                       }
-
                        // Is .L forced here?
                        if (*tok == DOTL)
                        {
                                tok++;
                                AMn = ABSL;
                        }
                        // Is .L forced here?
                        if (*tok == DOTL)
                        {
                                tok++;
                                AMn = ABSL;
                        }
+                       else
+                       {
+                               // Defined, absolute values from $FFFF8000..$00007FFF get optimized
+                               // to absolute short
+                               if (CHECK_OPTS(OPT_ABS_SHORT)
+                                       && ((AnEXATTR & (TDB | DEFINED)) == DEFINED)
+                                       && (((uint32_t)AnEXVAL + 0x8000) < 0x10000))
+                               {
+                                       AMn = ABSW;
+
+                                       if (sbra_flag)
+                                               warn("absolute value from $FFFF8000..$00007FFF optimised to absolute short");
+                               }
+                       }
 
                        goto AnOK;
                }
 
                        goto AnOK;
                }
index b0439a0725757015801e781822de35e5e7b43c3c..277ee277c1b60e18827650fda2ff0416de26e2ca 100644 (file)
--- a/version.h
+++ b/version.h
@@ -15,7 +15,7 @@
 
 #define MAJOR   1              // Major version number
 #define MINOR   13             // Minor version number
 
 #define MAJOR   1              // Major version number
 #define MINOR   13             // Minor version number
-#define PATCH   2              // Patch release number
+#define PATCH   3              // Patch release number
 
 #endif // __VERSION_H__
 
 
 #endif // __VERSION_H__