* src/SDCCcse.c (cseBBlock): retain assignment to self when volatile

* src/SDCCast.c (isLoopCountable): fixed bug #1161985

git-svn-id: https://sdcc.svn.sourceforge.net/svnroot/sdcc/trunk/sdcc@3697 4a8a32a2-be11-0410-ad9d-d568d2c75423

diff --git a/ChangeLog b/ChangeLog
index 9f4e7af7351a9936e493f6c6392bf8cc35e9a7df..827acfade3e7fdad1c5d85625a8064efabe93ad1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-03-16 Erik Petrich <epetrich AT ivorytower.norman.ok.us>
+
+       * src/SDCCcse.c (cseBBlock): retain assignment to self when volatile
+       * src/SDCCast.c (isLoopCountable): fixed bug #1161985
+
 2005-03-15 Maarten Brock <sourceforge.brock AT dse.nl>
 
        * device/lib/printf_large.c: removed inline assembly for portability and

diff --git a/src/SDCCast.c b/src/SDCCast.c
index f872f88c25fcb58d6b34ce0c6a191e919c118639..e0ea695aa30a690521125f9daafa64620a3073de 100644 (file)
--- a/src/SDCCast.c
+++ b/src/SDCCast.c
@@ -1533,6 +1533,8 @@ isLoopCountable (ast * initExpr, ast * condExpr, ast * loopExpr,
         }
 
     }
+  else
+    return FALSE;
 
   /* check loop expression is of the form <sym>++ */
   if (!IS_AST_OP (loopExpr))

diff --git a/src/SDCCcse.c b/src/SDCCcse.c
index 1e07bb45572b067f83df969f7e56c90abfd3f9de..05c6e2e6ca5fa892d86a3accdec7452e07848938 100644 (file)
--- a/src/SDCCcse.c
+++ b/src/SDCCcse.c
@@ -2057,7 +2057,7 @@ cseBBlock (eBBlock * ebb, int computeOnly,
 
       /* if after all this it becomes an assignment to self
          then delete it and continue */
-      if (ASSIGNMENT_TO_SELF (ic))
+      if (ASSIGNMENT_TO_SELF (ic) && !isOperandVolatile (IC_RIGHT(ic), FALSE))
         {
           remiCodeFromeBBlock (ebb, ic);
           continue;