Removed the EXPR_FORCE... ops

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

diff --git a/src/common/exprdefs.c b/src/common/exprdefs.c
index 48258be4983eed14df9556d6ab53191b98424ce3..78b686360721b0ab7af0b368e8073780c93605f4 100644 (file)
--- a/src/common/exprdefs.c
+++ b/src/common/exprdefs.c
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -172,14 +172,6 @@ static void InternalDumpExpr (const ExprNode* Expr, const ExprNode* (*ResolveSym
            printf (" BOOL_NOT");
            break;
 
-        case EXPR_FORCEWORD:
-            printf (" FORCE_WORD");
-            break;
-
-        case EXPR_FORCEFAR:
-            printf (" FORCE_FAR");
-            break;
-
                case EXPR_BYTE0:
            printf (" BYTE0");
            break;

diff --git a/src/common/exprdefs.h b/src/common/exprdefs.h
index 8f9bc56f277132755b83edf966fafb72c866a36b..af7f6c0522d5a1416ee121ddfa4f785d24323ed2 100644 (file)
--- a/src/common/exprdefs.h
+++ b/src/common/exprdefs.h
@@ -6,10 +6,10 @@
 /*                                                                           */
 /*                                                                           */
 /*                                                                           */
-/* (C) 1998-2000 Ullrich von Bassewitz                                       */
-/*               Wacholderweg 14                                             */
-/*               D-70597 Stuttgart                                           */
-/* EMail:        uz@musoftware.de                                            */
+/* (C) 1998-2003 Ullrich von Bassewitz                                       */
+/*               Römerstraße 52                                              */
+/*               D-70794 Filderstadt                                         */
+/* EMail:        uz@cc65.org                                                 */
 /*                                                                           */
 /*                                                                           */
 /* This software is provided 'as-is', without any expressed or implied       */
@@ -87,8 +87,6 @@
 #define EXPR_NOT                       (EXPR_UNARYNODE | 0x02)
 #define EXPR_SWAP                      (EXPR_UNARYNODE | 0x03)
 #define EXPR_BOOLNOT           (EXPR_UNARYNODE | 0x04)
-#define EXPR_FORCEWORD         (EXPR_UNARYNODE | 0x05)
-#define EXPR_FORCEFAR          (EXPR_UNARYNODE | 0x06)
 
 #define EXPR_BYTE0             (EXPR_UNARYNODE | 0x08)
 #define EXPR_BYTE1             (EXPR_UNARYNODE | 0x09)

diff --git a/src/ld65/expr.c b/src/ld65/expr.c
index c5967732d487cc7770a5f28b979ffc3ec17cd558..29c61207a3f202845e928f4d540ed8d6afa8dd0c 100644 (file)
--- a/src/ld65/expr.c
+++ b/src/ld65/expr.c
@@ -357,11 +357,6 @@ long GetExprVal (ExprNode* Expr)
        case EXPR_BOOLNOT:
                    return !GetExprVal (Expr->Left);
 
-        case EXPR_FORCEWORD:
-        case EXPR_FORCEFAR:
-            /* These two have no effect on the expression result */
-            return GetExprVal (Expr->Left);
-
                case EXPR_BYTE0:
            return GetExprVal (Expr->Left) & 0xFF;
 
@@ -380,7 +375,7 @@ long GetExprVal (ExprNode* Expr)
                case EXPR_WORD1:
            return (GetExprVal (Expr->Left) >> 16) & 0xFFFF;
 
-        default:                                         
+        default:
                    Internal ("Unknown expression Op type: %u", Expr->Op);
            /* NOTREACHED */
            return 0;