From: Peter Johnson <peter@tortall.net>
Date: Mon, 21 May 2001 22:10:27 +0000 (-0000)
Subject: Added TO and segreg.
X-Git-Tag: v0.1.0~481
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=8bc6949d157fc795930b0e6e35cc3986215cf4cf;p=yasm

Added TO and segreg.

svn path=/trunk/yasm/; revision=30
---

diff --git a/modules/parsers/nasm/bison.y.in b/modules/parsers/nasm/bison.y.in
index f852b1fa..35390c40 100644
--- a/modules/parsers/nasm/bison.y.in
+++ b/modules/parsers/nasm/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.5 2001/05/21 21:44:47 mu Exp $
+/* $Id: bison.y.in,v 1.6 2001/05/21 22:10:27 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -53,6 +53,7 @@ extern void yyerror(char *);
 %token <int_val> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NEAR SHORT FAR NOSPLIT ORG
+%token TO
 %token O16 O32 A16 A32 LOCK REPNZ REP REPZ
 %token <int_val> OPERSIZE ADDRSIZE
 %token <int_val> CR4 CRREG_NOTCR4 DRREG TRREG ST0 FPUREG_NOTST0 MMXREG XMMREG
@@ -71,7 +72,7 @@ extern void yyerror(char *);
 
 %type <bc> line exp instr instrbase
 
-%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs
+%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs segreg
 %type <ea_val> mem memaddr memexp
 %type <ea_val> mem8x mem16x mem32x mem64x mem80x mem128x
 %type <ea_val> mem8 mem16 mem32 mem64 mem80 mem128 mem1632
@@ -162,6 +163,11 @@ reg_notcs: reg_dess
     | WORD reg_notcs
 ;
 
+segreg: reg_notcs
+    | REG_CS
+    | WORD segreg
+;
+
 /* memory addresses */
 /* TODO: formula expansion */
 memexp: INTNUM	    { (void)ConvertIntToEA(&$$, $1); }
diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y
index dcf37620..a0241775 100644
--- a/modules/parsers/nasm/nasm-bison.y
+++ b/modules/parsers/nasm/nasm-bison.y
@@ -1,4 +1,4 @@
-/* $Id: nasm-bison.y,v 1.5 2001/05/21 21:44:47 mu Exp $
+/* $Id: nasm-bison.y,v 1.6 2001/05/21 22:10:27 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -53,6 +53,7 @@ extern void yyerror(char *);
 %token <int_val> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NEAR SHORT FAR NOSPLIT ORG
+%token TO
 %token O16 O32 A16 A32 LOCK REPNZ REP REPZ
 %token <int_val> OPERSIZE ADDRSIZE
 %token <int_val> CR4 CRREG_NOTCR4 DRREG TRREG ST0 FPUREG_NOTST0 MMXREG XMMREG
@@ -71,7 +72,7 @@ extern void yyerror(char *);
 
 %type <bc> line exp instr instrbase
 
-%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs
+%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs segreg
 %type <ea_val> mem memaddr memexp
 %type <ea_val> mem8x mem16x mem32x mem64x mem80x mem128x
 %type <ea_val> mem8 mem16 mem32 mem64 mem80 mem128 mem1632
@@ -162,6 +163,11 @@ reg_notcs: reg_dess
     | WORD reg_notcs
 ;
 
+segreg: reg_notcs
+    | REG_CS
+    | WORD segreg
+;
+
 /* memory addresses */
 /* TODO: formula expansion */
 memexp: INTNUM	    { (void)ConvertIntToEA(&$$, $1); }
diff --git a/src/bison.y.in b/src/bison.y.in
index f852b1fa..35390c40 100644
--- a/src/bison.y.in
+++ b/src/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.5 2001/05/21 21:44:47 mu Exp $
+/* $Id: bison.y.in,v 1.6 2001/05/21 22:10:27 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -53,6 +53,7 @@ extern void yyerror(char *);
 %token <int_val> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NEAR SHORT FAR NOSPLIT ORG
+%token TO
 %token O16 O32 A16 A32 LOCK REPNZ REP REPZ
 %token <int_val> OPERSIZE ADDRSIZE
 %token <int_val> CR4 CRREG_NOTCR4 DRREG TRREG ST0 FPUREG_NOTST0 MMXREG XMMREG
@@ -71,7 +72,7 @@ extern void yyerror(char *);
 
 %type <bc> line exp instr instrbase
 
-%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs
+%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs segreg
 %type <ea_val> mem memaddr memexp
 %type <ea_val> mem8x mem16x mem32x mem64x mem80x mem128x
 %type <ea_val> mem8 mem16 mem32 mem64 mem80 mem128 mem1632
@@ -162,6 +163,11 @@ reg_notcs: reg_dess
     | WORD reg_notcs
 ;
 
+segreg: reg_notcs
+    | REG_CS
+    | WORD segreg
+;
+
 /* memory addresses */
 /* TODO: formula expansion */
 memexp: INTNUM	    { (void)ConvertIntToEA(&$$, $1); }
diff --git a/src/parsers/nasm/bison.y.in b/src/parsers/nasm/bison.y.in
index f852b1fa..35390c40 100644
--- a/src/parsers/nasm/bison.y.in
+++ b/src/parsers/nasm/bison.y.in
@@ -1,4 +1,4 @@
-/* $Id: bison.y.in,v 1.5 2001/05/21 21:44:47 mu Exp $
+/* $Id: bison.y.in,v 1.6 2001/05/21 22:10:27 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -53,6 +53,7 @@ extern void yyerror(char *);
 %token <int_val> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NEAR SHORT FAR NOSPLIT ORG
+%token TO
 %token O16 O32 A16 A32 LOCK REPNZ REP REPZ
 %token <int_val> OPERSIZE ADDRSIZE
 %token <int_val> CR4 CRREG_NOTCR4 DRREG TRREG ST0 FPUREG_NOTST0 MMXREG XMMREG
@@ -71,7 +72,7 @@ extern void yyerror(char *);
 
 %type <bc> line exp instr instrbase
 
-%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs
+%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs segreg
 %type <ea_val> mem memaddr memexp
 %type <ea_val> mem8x mem16x mem32x mem64x mem80x mem128x
 %type <ea_val> mem8 mem16 mem32 mem64 mem80 mem128 mem1632
@@ -162,6 +163,11 @@ reg_notcs: reg_dess
     | WORD reg_notcs
 ;
 
+segreg: reg_notcs
+    | REG_CS
+    | WORD segreg
+;
+
 /* memory addresses */
 /* TODO: formula expansion */
 memexp: INTNUM	    { (void)ConvertIntToEA(&$$, $1); }
diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y
index dcf37620..a0241775 100644
--- a/src/parsers/nasm/nasm-bison.y
+++ b/src/parsers/nasm/nasm-bison.y
@@ -1,4 +1,4 @@
-/* $Id: nasm-bison.y,v 1.5 2001/05/21 21:44:47 mu Exp $
+/* $Id: nasm-bison.y,v 1.6 2001/05/21 22:10:27 peter Exp $
  * Main bison parser
  *
  *  Copyright (C) 2001  Peter Johnson
@@ -53,6 +53,7 @@ extern void yyerror(char *);
 %token <int_val> RESERVE_SPACE
 %token INCBIN EQU TIMES
 %token SEG WRT NEAR SHORT FAR NOSPLIT ORG
+%token TO
 %token O16 O32 A16 A32 LOCK REPNZ REP REPZ
 %token <int_val> OPERSIZE ADDRSIZE
 %token <int_val> CR4 CRREG_NOTCR4 DRREG TRREG ST0 FPUREG_NOTST0 MMXREG XMMREG
@@ -71,7 +72,7 @@ extern void yyerror(char *);
 
 %type <bc> line exp instr instrbase
 
-%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs
+%type <int_val> fpureg reg32 reg16 reg8 reg_dess reg_fsgs reg_notcs segreg
 %type <ea_val> mem memaddr memexp
 %type <ea_val> mem8x mem16x mem32x mem64x mem80x mem128x
 %type <ea_val> mem8 mem16 mem32 mem64 mem80 mem128 mem1632
@@ -162,6 +163,11 @@ reg_notcs: reg_dess
     | WORD reg_notcs
 ;
 
+segreg: reg_notcs
+    | REG_CS
+    | WORD segreg
+;
+
 /* memory addresses */
 /* TODO: formula expansion */
 memexp: INTNUM	    { (void)ConvertIntToEA(&$$, $1); }