Make "TO" a x86 targetmod.

svn path=/trunk/yasm/; revision=681

diff --git a/modules/arch/x86/x86arch.h b/modules/arch/x86/x86arch.h
index 52028db981e7b6007a12cab50e22e44a5e5ec8db..4b852aff1788eede9b131cb9f0ede7a0f778f0ea 100644 (file)
--- a/modules/arch/x86/x86arch.h
+++ b/modules/arch/x86/x86arch.h
@@ -50,7 +50,8 @@ typedef enum {
 typedef enum {
     X86_NEAR,
     X86_SHORT,
-    X86_FAR
+    X86_FAR,
+    X86_TO
 } x86_parse_targetmod;
 
 typedef enum {

diff --git a/modules/arch/x86/x86id.re b/modules/arch/x86/x86id.re
index 6c1bb7dc9b7db7a56b5d5eb0bf7bc5fc3a57acf4..577b798b43eda318955ec49282d6ddb75c5657ca 100644 (file)
--- a/modules/arch/x86/x86id.re
+++ b/modules/arch/x86/x86id.re
@@ -1241,6 +1241,10 @@ x86_check_identifier(unsigned long data[4], const char *id)
            data[0] = X86_FAR;
            return ARCH_CHECK_ID_TARGETMOD;
        }
+       T O             {
+           data[0] = X86_TO;
+           return ARCH_CHECK_ID_TARGETMOD;
+       }
 
        /* operand size overrides */
        O "16"  {

diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index 248820db28992015ca849e16e6ad97b756e1ab6c..7be75e414da461d3120e4d96e7fa5d3448ce9d59 100644 (file)
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -97,7 +97,6 @@ static bytecode *nasm_parser_temp_bc;
 %token <int_info> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NOSPLIT
-%token TO
 %token <arch_data> INSN PREFIX REG SEGREG TARGETMOD
 %token LEFT_OP RIGHT_OP SIGNDIV SIGNMOD START_SECTION_ID
 %token <str_val> ID LOCAL_ID SPECIAL_ID

diff --git a/modules/parsers/nasm/nasm-token.re b/modules/parsers/nasm/nasm-token.re
index ab0aa1111594988e2a50816fe2998852401596f9..3db0ce7ebd7c35f6779446a34cd2bd38d3187522 100644 (file)
--- a/modules/parsers/nasm/nasm-token.re
+++ b/modules/parsers/nasm/nasm-token.re
@@ -306,8 +306,6 @@ scan:
 
        N O S P L I T   { RETURN(NOSPLIT); }
 
-       T O             { RETURN(TO); }
-
        /* operators */
        "<<"                    { RETURN(LEFT_OP); }
        ">>"                    { RETURN(RIGHT_OP); }

diff --git a/src/arch/x86/x86arch.h b/src/arch/x86/x86arch.h
index 52028db981e7b6007a12cab50e22e44a5e5ec8db..4b852aff1788eede9b131cb9f0ede7a0f778f0ea 100644 (file)
--- a/src/arch/x86/x86arch.h
+++ b/src/arch/x86/x86arch.h
@@ -50,7 +50,8 @@ typedef enum {
 typedef enum {
     X86_NEAR,
     X86_SHORT,
-    X86_FAR
+    X86_FAR,
+    X86_TO
 } x86_parse_targetmod;
 
 typedef enum {

diff --git a/src/arch/x86/x86id.re b/src/arch/x86/x86id.re
index 6c1bb7dc9b7db7a56b5d5eb0bf7bc5fc3a57acf4..577b798b43eda318955ec49282d6ddb75c5657ca 100644 (file)
--- a/src/arch/x86/x86id.re
+++ b/src/arch/x86/x86id.re
@@ -1241,6 +1241,10 @@ x86_check_identifier(unsigned long data[4], const char *id)
            data[0] = X86_FAR;
            return ARCH_CHECK_ID_TARGETMOD;
        }
+       T O             {
+           data[0] = X86_TO;
+           return ARCH_CHECK_ID_TARGETMOD;
+       }
 
        /* operand size overrides */
        O "16"  {

diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index 248820db28992015ca849e16e6ad97b756e1ab6c..7be75e414da461d3120e4d96e7fa5d3448ce9d59 100644 (file)
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -97,7 +97,6 @@ static bytecode *nasm_parser_temp_bc;
 %token <int_info> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NOSPLIT
-%token TO
 %token <arch_data> INSN PREFIX REG SEGREG TARGETMOD
 %token LEFT_OP RIGHT_OP SIGNDIV SIGNMOD START_SECTION_ID
 %token <str_val> ID LOCAL_ID SPECIAL_ID

diff --git a/src/parsers/nasm/nasm-token.re b/src/parsers/nasm/nasm-token.re
index ab0aa1111594988e2a50816fe2998852401596f9..3db0ce7ebd7c35f6779446a34cd2bd38d3187522 100644 (file)
--- a/src/parsers/nasm/nasm-token.re
+++ b/src/parsers/nasm/nasm-token.re
@@ -306,8 +306,6 @@ scan:
 
        N O S P L I T   { RETURN(NOSPLIT); }
 
-       T O             { RETURN(TO); }
-
        /* operators */
        "<<"                    { RETURN(LEFT_OP); }
        ">>"                    { RETURN(RIGHT_OP); }