diff options
| author | Wilson Fung <[email protected]> | 2012-05-01 18:39:34 -0800 |
|---|---|---|
| committer | Andrew Boktor <[email protected]> | 2014-08-14 13:19:06 -0700 |
| commit | 7f68b69570b5acaf79520ab7fd2d788885e2ad5d (patch) | |
| tree | d2e36aaf94729d091f404e78669777f29321ff82 /cuobjdump_to_ptxplus | |
| parent | 47680ea59c580af95675d6970923d70e30bd8a77 (diff) | |
Renamed "ST" token to "SASS_ST" and "LD" token to "SASS_LD". This avoids identifier collision with boost::regex header.
[git-p4: depot-paths = "//depot/gpgpu_sim_research/fermi/distribution/": change = 12237]
Diffstat (limited to 'cuobjdump_to_ptxplus')
| -rw-r--r-- | cuobjdump_to_ptxplus/sass.l | 4 | ||||
| -rw-r--r-- | cuobjdump_to_ptxplus/sass.y | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/cuobjdump_to_ptxplus/sass.l b/cuobjdump_to_ptxplus/sass.l index a4beeb1..ea1e052 100644 --- a/cuobjdump_to_ptxplus/sass.l +++ b/cuobjdump_to_ptxplus/sass.l @@ -75,8 +75,8 @@ I2F yylval.string_value = strdup(yytext); return I2F; I2I yylval.string_value = strdup(yytext); return I2I; S2R yylval.string_value = strdup(yytext); return S2R; STS yylval.string_value = strdup(yytext); return STS; -LD yylval.string_value = strdup(yytext); return LD; -ST yylval.string_value = strdup(yytext); return ST; +LD yylval.string_value = strdup(yytext); return SASS_LD; +ST yylval.string_value = strdup(yytext); return SASS_ST; IADD yylval.string_value = strdup(yytext); return IADD; IADD32 yylval.string_value = strdup(yytext); return IADD32; IADD32I yylval.string_value = strdup(yytext); return IADD32I; diff --git a/cuobjdump_to_ptxplus/sass.y b/cuobjdump_to_ptxplus/sass.y index 06d2750..634757b 100644 --- a/cuobjdump_to_ptxplus/sass.y +++ b/cuobjdump_to_ptxplus/sass.y @@ -26,7 +26,7 @@ cuobjdumpInst *instEntry; %token <string_value> IMUL IMUL24 IMULS24 IMUL32 IMUL32S24 IMUL32U24 IMUL32I IMUL32I24 IMUL32IS24 %token <string_value> ISET LG2 LLD LST MOV MOV32 MVC MVI NOP NOT NOTS OR ORS %token <string_value> R2A R2G R2GU16U8 RCP RCP32 RET RRO RSQ SIN SHL SHR SSY XOR XORS -%token <string_value> S2R LD STS LDS ST IMIN IMAX A2R FMAX FMIN TEX TEX32 C2R EXIT +%token <string_value> S2R SASS_LD STS LDS SASS_ST IMIN IMAX A2R FMAX FMIN TEX TEX32 C2R EXIT %token <string_value> GRED PBK BRK R2C GATOM %token <string_value> EQ EQU GE GEU GT GTU LE LEU LT LTU NE NEU @@ -145,8 +145,8 @@ simpleInstructions : ADA | AND | ANDS | COS | DADD | DFMA | DMUL | EX2 | F2F | IMUL32U24 | ISET | LG2 | LLD | LST | MOV | MOV32 | MVC | MVI | NOP | NOT | NOTS | OR | ORS | R2A | R2G | R2GU16U8 | RCP | RCP32 | RET | RRO - | RSQ | SHL | SHR | SIN | SSY | XOR | XORS | S2R | LD | STS - | LDS | ST | EXIT | BAR | IMIN | IMAX | A2R | FMAX | FMIN + | RSQ | SHL | SHR | SIN | SSY | XOR | XORS | S2R | SASS_LD | STS + | LDS | SASS_ST | EXIT | BAR | IMIN | IMAX | A2R | FMAX | FMIN | TEX | TEX32 | C2R | BRK | R2C ; |