From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Mon, 15 Aug 2011 17:19:05 +0000 (+0000)
Subject: Fixed a problem with the range check.
X-Git-Tag: V2.13.3~292
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=cd50385b727eb04afaec3791ce52ce15b8cb15ae;p=cc65

Fixed a problem with the range check.


git-svn-id: svn://svn.cc65.org/cc65/trunk@5170 b7a2c559-68d2-44c3-8de9-860c34a00d81
---

diff --git a/src/ca65/segment.c b/src/ca65/segment.c
index 004bf45ab..242783df4 100644
--- a/src/ca65/segment.c
+++ b/src/ca65/segment.c
@@ -328,6 +328,13 @@ unsigned char GetSegAddrSize (unsigned SegNum)
 void SegCheck (void)
 /* Check the segments for range and other errors */
 {
+    static const unsigned long U_Hi[4] = {
+       	0x000000FFL, 0x0000FFFFL, 0x00FFFFFFL, 0xFFFFFFFFL
+    };
+    static const long S_Hi[4] = {
+       	0x0000007FL, 0x00007FFFL, 0x007FFFFFL, 0x7FFFFFFFL
+    };
+
     unsigned I;
     for (I = 0; I < CollCount (&SegmentList); ++I) {
         Segment* S = CollAtUnchecked (&SegmentList, I);
@@ -346,44 +353,31 @@ void SegCheck (void)
                 /* Check if the expression is constant */
                 if (ED_IsConst (&ED)) {
 
+                    long Hi, Lo;
+     	       	    unsigned J;
+
        	       	    /* The expression is constant. Check for range errors. */
-     	       	    int Abs = (F->Type != FRAG_SEXPR);
-                    long Val = ED.Val;
-     	       	    unsigned I;
-
-     	       	    if (F->Len == 1) {
-     	       	   	if (Abs) {
-     	       	   	    /* Absolute value */
-     	       	   	    if (Val > 255) {
-     	       	       	     	LIError (&F->LI, "Range error (%ld not in [0..255])", Val);
-     	       	   	    }
-     	       	   	} else {
-     	     	   	    /* PC relative value */
-     	     	   	    if (Val < -128 || Val > 127) {
-     	       	       	     	LIError (&F->LI, "Range error (%ld not in [-128..127])", Val);
-     	     	   	    }
-     	     	   	}
-     	       	    } else if (F->Len == 2) {
-     	     	    	if (Abs) {
-     	     	   	    /* Absolute value */
-     	     	   	    if (Val > 65535) {
-     	       	       	     	LIError (&F->LI, "Range error (%ld not in [0..65535])", Val);
-     	     	   	    }
-     	     	   	} else {
-     	     	   	    /* PC relative value */
-     	     	   	    if (Val < -32768 || Val > 32767) {
-     	       	       	     	LIError (&F->LI, "Range error (%ld not in [-32768..32767])", Val);
-     	       		    }
-     	     		}
-     	     	    }
+                    CHECK (F->Len <= 4);
+                    if (F->Type == FRAG_SEXPR) {
+                        Hi = S_Hi[F->Len-1];
+                        Lo = ~Hi;
+                    } else {
+                        Hi = U_Hi[F->Len-1];
+                        Lo = 0;
+                    }
+                    if (ED.Val > Hi || ED.Val < Lo) {
+                        LIError (&F->LI,
+                                 "Range error (%ld not in [%ld..%ld])",
+                                 ED.Val, Lo, Hi);
+                    }
 
                     /* We don't need the expression tree any longer */
                     FreeExpr (F->V.Expr);
 
      	     	    /* Convert the fragment into a literal fragment */
-     	     	    for (I = 0; I < F->Len; ++I) {
-     	     	       	F->V.Data [I] = Val & 0xFF;
-     	     	       	Val >>= 8;
+     	     	    for (J = 0; J < F->Len; ++J) {
+     	     	       	F->V.Data[J] = ED.Val & 0xFF;
+     	     	       	ED.Val >>= 8;
      	     	    }
      	     	    F->Type = FRAG_LITERAL;
 
@@ -392,13 +386,13 @@ void SegCheck (void)
      	     	    /* We cannot evaluate the expression now, leave the job for
      	     	     * the linker. However, we can check if the address size
                      * matches the fragment size, and we will do so.
-     		     */
+     	    	     */
                     if ((F->Len == 1 && ED.AddrSize > ADDR_SIZE_ZP)  ||
                         (F->Len == 2 && ED.AddrSize > ADDR_SIZE_ABS) ||
                         (F->Len == 3 && ED.AddrSize > ADDR_SIZE_FAR)) {
      	       	        LIError (&F->LI, "Range error");
      	     	    }
-     		}
+     	    	}
 
                 /* Release memory allocated for the expression decriptor */
                 ED_Done (&ED);