Changeset 1304:b995c146366e

Timestamp:

05/06/09 13:56:33 (3 years ago)

Author:

Christian Kamm <kamm incasoftware de>

Children:

1308:316e9ecfeb7d 1310:85b80c4fe48a

branch:

default

Message:

Ignore short/long prefix of labels instead of ignoring the whole branch
instruction!

Files:

• gen/asm-x86-32.h (modified) (3 diffs)
• gen/asm-x86-64.h (modified) (3 diffs)

gen/asm-x86-32.h

@@ -1420 +1420 @@
-                    nextToken();
-                }
-        else if ( token->value == TOKint16 || token->value == TOKint32 )
-                {
-            //throw away the 'short' in "jle short label;". Works for 'long' also.
-            operands[0] = operands[1];
-                    return;
-                }
-                else if ( token->value != TOKeof )
-                {
@@ -2741 +2735 @@
-            Expression * e;
-            Identifier * ident = NULL;
+
+            // get rid of short/long prefixes for branches
+            if (opTakesLabel() && (token->value == TOKint16 || token->value == TOKint64))
+                nextToken();
-
-            switch ( token->value )
@@ -2888 +2886 @@
-                    goto do_dollar;
-                    break;
-            case TOKint16:
-            case TOKint32:
-            //This if for the 'short' in "jle short Label;"
-            return Handled;
-                default:
-                    if ( op == Op_FMath0 || op == Op_FdST0ST1 || op == Op_FMath )

gen/asm-x86-64.h

@@ -1542 +1542 @@
-                    nextToken();
-                }
-                else if ( token->value == TOKint16 || token->value == TOKint32 || token->value == TOKint64 )
-                {
-                    //throw away the 'short' in "jle short Label;". Works for long also.
-                    operands[0] = operands[1];
-                    return;
-                }
-                else if ( token->value != TOKeof )
-                {
@@ -2864 +2858 @@
-            Expression * e;
-            Identifier * ident = NULL;
+
+            // get rid of short/long prefixes for branches
+            if (opTakesLabel() && (token->value == TOKint16 || token->value == TOKint64))
+                nextToken();
-
-            switch ( token->value )
@@ -3011 +3009 @@
-                    goto do_dollar;
-                    break;
-                case TOKint16:
-                case TOKint32:
-                case TOKint64:
-                    //This is for the 'short' in "jle short Label;"
-                    return Handled;
-                    break;
-                default:
-                    if ( op == Op_FMath0 || op == Op_FdST0ST1 || op == Op_FMath )