From: Peter Johnson Date: Thu, 5 Jul 2001 02:51:01 +0000 (-0000) Subject: Add memref to declared types. X-Git-Tag: v0.1.0~420 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=a8329fcb6444e0ba43b85500ae93ab494001446b;p=yasm Add memref to declared types. svn path=/trunk/yasm/; revision=91 --- diff --git a/modules/parsers/nasm/bison.y.in b/modules/parsers/nasm/bison.y.in index f1d87fba..daf2e680 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.12 2001/07/04 20:53:21 peter Exp $ +/* $Id: bison.y.in,v 1.13 2001/07/05 02:51:01 peter Exp $ * Main bison parser * * Copyright (C) 2001 Peter Johnson, Michael Urman @@ -82,9 +82,9 @@ extern void yyerror(char *); %type line exp instr instrbase label %type fpureg reg32 reg16 reg8 segreg -%type mem memaddr memexp +%type memexp memaddr memref %type mem8x mem16x mem32x mem64x mem80x mem128x -%type mem8 mem16 mem32 mem64 mem80 mem128 mem1632 +%type mem mem8 mem16 mem32 mem64 mem80 mem128 mem1632 %type rm8x rm16x rm32x /*rm64x rm128x*/ %type rm8 rm16 rm32 rm64 rm128 %type immexp imm imm8x imm16x imm32x imm8 imm16 imm32 diff --git a/modules/parsers/nasm/nasm-bison.y b/modules/parsers/nasm/nasm-bison.y index 1452b2d8..c9271fb3 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.12 2001/07/04 20:53:21 peter Exp $ +/* $Id: nasm-bison.y,v 1.13 2001/07/05 02:51:01 peter Exp $ * Main bison parser * * Copyright (C) 2001 Peter Johnson, Michael Urman @@ -82,9 +82,9 @@ extern void yyerror(char *); %type line exp instr instrbase label %type fpureg reg32 reg16 reg8 segreg -%type mem memaddr memexp +%type memexp memaddr memref %type mem8x mem16x mem32x mem64x mem80x mem128x -%type mem8 mem16 mem32 mem64 mem80 mem128 mem1632 +%type mem mem8 mem16 mem32 mem64 mem80 mem128 mem1632 %type rm8x rm16x rm32x /*rm64x rm128x*/ %type rm8 rm16 rm32 rm64 rm128 %type immexp imm imm8x imm16x imm32x imm8 imm16 imm32 diff --git a/src/bison.y.in b/src/bison.y.in index f1d87fba..daf2e680 100644 --- a/src/bison.y.in +++ b/src/bison.y.in @@ -1,4 +1,4 @@ -/* $Id: bison.y.in,v 1.12 2001/07/04 20:53:21 peter Exp $ +/* $Id: bison.y.in,v 1.13 2001/07/05 02:51:01 peter Exp $ * Main bison parser * * Copyright (C) 2001 Peter Johnson, Michael Urman @@ -82,9 +82,9 @@ extern void yyerror(char *); %type line exp instr instrbase label %type fpureg reg32 reg16 reg8 segreg -%type mem memaddr memexp +%type memexp memaddr memref %type mem8x mem16x mem32x mem64x mem80x mem128x -%type mem8 mem16 mem32 mem64 mem80 mem128 mem1632 +%type mem mem8 mem16 mem32 mem64 mem80 mem128 mem1632 %type rm8x rm16x rm32x /*rm64x rm128x*/ %type rm8 rm16 rm32 rm64 rm128 %type immexp imm imm8x imm16x imm32x imm8 imm16 imm32 diff --git a/src/parsers/nasm/bison.y.in b/src/parsers/nasm/bison.y.in index f1d87fba..daf2e680 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.12 2001/07/04 20:53:21 peter Exp $ +/* $Id: bison.y.in,v 1.13 2001/07/05 02:51:01 peter Exp $ * Main bison parser * * Copyright (C) 2001 Peter Johnson, Michael Urman @@ -82,9 +82,9 @@ extern void yyerror(char *); %type line exp instr instrbase label %type fpureg reg32 reg16 reg8 segreg -%type mem memaddr memexp +%type memexp memaddr memref %type mem8x mem16x mem32x mem64x mem80x mem128x -%type mem8 mem16 mem32 mem64 mem80 mem128 mem1632 +%type mem mem8 mem16 mem32 mem64 mem80 mem128 mem1632 %type rm8x rm16x rm32x /*rm64x rm128x*/ %type rm8 rm16 rm32 rm64 rm128 %type immexp imm imm8x imm16x imm32x imm8 imm16 imm32 diff --git a/src/parsers/nasm/nasm-bison.y b/src/parsers/nasm/nasm-bison.y index 1452b2d8..c9271fb3 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.12 2001/07/04 20:53:21 peter Exp $ +/* $Id: nasm-bison.y,v 1.13 2001/07/05 02:51:01 peter Exp $ * Main bison parser * * Copyright (C) 2001 Peter Johnson, Michael Urman @@ -82,9 +82,9 @@ extern void yyerror(char *); %type line exp instr instrbase label %type fpureg reg32 reg16 reg8 segreg -%type mem memaddr memexp +%type memexp memaddr memref %type mem8x mem16x mem32x mem64x mem80x mem128x -%type mem8 mem16 mem32 mem64 mem80 mem128 mem1632 +%type mem mem8 mem16 mem32 mem64 mem80 mem128 mem1632 %type rm8x rm16x rm32x /*rm64x rm128x*/ %type rm8 rm16 rm32 rm64 rm128 %type immexp imm imm8x imm16x imm32x imm8 imm16 imm32