commit 11599f49da963a0cf71970ad69fe66de981d35ee
author H. Peter Anvin <hpa@zytor.com> Sat Dec 22 23:09:54 2018 -0800
committer H. Peter Anvin <hpa@zytor.com> Mon Dec 24 12:45:58 2018 -0800
tree 0426512f6a8204d5a121b3e33caad33d525f22a7
parent e7c75e55212c8e88b5574ff746a375146bc02373

Factor out size tokens and annotate with the corresponding size

There is space in the token table to explicitly encode the size
corresponding to a size token. We might as well do so...

Signed-off-by: H. Peter Anvin <hpa@zytor.com>

asm/parser.c

diff --git a/asm/parser.c b/asm/parser.c
index c76696c..9349e25 100644
--- a/asm/parser.c
+++ b/asm/parser.c
@@ -767,7 +767,8 @@
         }
         first = false;
         op->type = 0; /* so far, no override */
-        while (i == TOKEN_SPECIAL) {    /* size specifiers */
+        /* size specifiers */
+        while (i == TOKEN_SPECIAL || i == TOKEN_SIZE) {
             switch (tokval.t_integer) {
             case S_BYTE:
                 if (!setsize)   /* we want to use only the first */
@@ -835,7 +836,8 @@
             mref = true;
             bracket = (i == '[');
             i = stdscan(NULL, &tokval); /* then skip the colon */
-            while (i == TOKEN_SPECIAL || i == TOKEN_PREFIX) {
+            while (i == TOKEN_SPECIAL || i == TOKEN_SIZE ||
+                   i == TOKEN_PREFIX) {
                 process_size_override(result, op);
                 i = stdscan(NULL, &tokval);
             }
@@ -880,7 +882,8 @@
             }
 
             i = stdscan(NULL, &tokval); /* then skip the colon */
-            while (i == TOKEN_SPECIAL || i == TOKEN_PREFIX) {
+            while (i == TOKEN_SPECIAL || i == TOKEN_SIZE ||
+                   i == TOKEN_PREFIX) {
                 process_size_override(result, op);
                 i = stdscan(NULL, &tokval);
             }