Skip to contentSkip to conversation

target/hexagon/idef-parser: Remove unused code paths

PATCH In review Anton Johansson via 2 participants 2 messages Jan 31, 2023

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 target/hexagon/idef-parser: Remove unused code paths

Removes code paths used by COF instructions, which are no longer processed by idef-parser.

---
 target/hexagon/idef-parser/idef-parser.h    |  1 -
 target/hexagon/idef-parser/idef-parser.lex  | 27 +------------
 target/hexagon/idef-parser/idef-parser.y    | 45 +--------------------
 target/hexagon/idef-parser/macros.inc       | 10 -----
 target/hexagon/idef-parser/parser-helpers.c |  3 --
 5 files changed, 4 insertions(+), 82 deletions(-)
target/hexagon/idef-parser/idef-parser.h +0 -1
index 5c49d4da3e..354528bbc8 100644
@@ -82,7 +82,6 @@ enum ImmUnionTag {
     VALUE,
     QEMU_TMP,
     IMM_PC,
-    IMM_NPC,
     IMM_CONSTEXT,
 };
 
target/hexagon/idef-parser/idef-parser.lex +2 -25
index ff87a02c3a..2658d9fb2e 100644
@@ -140,8 +140,6 @@ STRING_LIT               \"(\\.|[^"\\])*\"
                            yylval->rvalue.is_dotnew = true;
                            yylval->rvalue.signedness = SIGNED;
                            return PRED; }
-"IV1DEAD()"              |
-"fPAUSE(uiV);"           { return ';'; }
 "+="                     { return INC; }
 "-="                     { return DEC; }
 "++"                     { return PLUSPLUS; }
@@ -159,9 +157,8 @@ STRING_LIT               \"(\\.|[^"\\])*\"
 "else"                   { return ELSE; }
 "for"                    { return FOR; }
 "fREAD_IREG"             { return ICIRC; }
-"fPART1"                 { return PART1; }
 "if"                     { return IF; }
-"fFRAME_SCRAMBLE"        { return FSCR; }
+"fFRAME_SCRAMBLE"        |
 "fFRAME_UNSCRAMBLE"      { return FSCR; }
 "fFRAMECHECK"            { return FCHK; }
 "Constant_extended"      { return CONSTEXT; }
@@ -312,11 +309,7 @@ STRING_LIT               \"(\\.|[^"\\])*\"
 "(unsigned int)"         { yylval->cast.bit_width = 32;
                            yylval->cast.signedness = UNSIGNED;
                            return CAST; }
-"fREAD_PC()"             |
-"PC"                     { return PC; }
-"fREAD_NPC()"            |
-"NPC"                    { return NPC; }
-"fGET_LPCFG"             |
+"fREAD_PC()"             { return PC; }
 "USR.LPCFG"              { return LPCFG; }
 "LOAD_CANCEL(EA)"        { return LOAD_CANCEL; }
 "STORE_CANCEL(EA)"       |
@@ -360,14 +353,6 @@ STRING_LIT               \"(\\.|[^"\\])*\"
                            yylval->rvalue.bit_width = 32;
                            yylval->rvalue.signedness = UNSIGNED;
                            return REG; }
-"fREAD_LC"[01]           { yylval->rvalue.type = REGISTER;
-                           yylval->rvalue.reg.type = CONTROL;
-                           yylval->rvalue.reg.id = HEX_REG_LC0
-                                                 + (yytext[8] - '0') * 2;
-                           yylval->rvalue.reg.bit_width = 32;
-                           yylval->rvalue.bit_width = 32;
-                           yylval->rvalue.signedness = UNSIGNED;
-                           return REG; }
 "LC"[01]                 { yylval->rvalue.type = REGISTER;
                            yylval->rvalue.reg.type = CONTROL;
                            yylval->rvalue.reg.id = HEX_REG_LC0
@@ -376,14 +361,6 @@ STRING_LIT               \"(\\.|[^"\\])*\"
                            yylval->rvalue.bit_width = 32;
                            yylval->rvalue.signedness = UNSIGNED;
                            return REG; }
-"fREAD_SA"[01]           { yylval->rvalue.type = REGISTER;
-                           yylval->rvalue.reg.type = CONTROL;
-                           yylval->rvalue.reg.id = HEX_REG_SA0
-                                                 + (yytext[8] - '0') * 2;
-                           yylval->rvalue.reg.bit_width = 32;
-                           yylval->rvalue.bit_width = 32;
-                           yylval->rvalue.signedness = UNSIGNED;
-                           return REG; }
 "SA"[01]                 { yylval->rvalue.type = REGISTER;
                            yylval->rvalue.reg.type = CONTROL;
                            yylval->rvalue.reg.id = HEX_REG_SA0
target/hexagon/idef-parser/idef-parser.y +2 -43

81 lines not on this page · raw message

target/hexagon/idef-parser/macros.inc +0 -10
index 6b697da87a..c2801c97f1 100644
@@ -97,17 +97,8 @@
 #define fWRITE_LR(A) (LR = A)
 #define fWRITE_FP(A) (FP = A)
 #define fWRITE_SP(A) (SP = A)
-/*
- * Note: There is a rule in the parser that matches `PC = ...` and emits
- * a call to `gen_write_new_pc`. We need to call `gen_write_new_pc` to
- * get the correct semantics when there are multiple stores in a packet.
- */
-#define fBRANCH(LOC, TYPE) (PC = LOC)
-#define fJUMPR(REGNO, TARGET, TYPE) (PC = TARGET)
 #define fWRITE_LOOP_REGS0(START, COUNT) SA0 = START; (LC0 = COUNT)
 #define fWRITE_LOOP_REGS1(START, COUNT) SA1 = START; (LC1 = COUNT)
-#define fWRITE_LC0(VAL) (LC0 = VAL)
-#define fWRITE_LC1(VAL) (LC1 = VAL)
 #define fSET_LPCFG(VAL) (USR.LPCFG = VAL)
 #define fWRITE_P0(VAL) P0 = VAL;
 #define fWRITE_P1(VAL) P1 = VAL;
@@ -121,7 +112,6 @@
 #define fEA_GPI(IMM) (EA = fREAD_GP() + IMM)
 #define fPM_I(REG, IMM) (REG = REG + IMM)
 #define fPM_M(REG, MVAL) (REG = REG + MVAL)
-#define fWRITE_NPC(VAL) (PC = VAL)
 
 /* Unary operators */
 #define fROUND(A) (A + 0x8000)
target/hexagon/idef-parser/parser-helpers.c +0 -3
index 8110686c51..937fed6a42 100644
@@ -185,9 +185,6 @@ void imm_print(Context *c, YYLTYPE *locp, HexImm *imm)
     case IMM_PC:
         EMIT(c, "ctx->base.pc_next");
         break;
-    case IMM_NPC:
-        EMIT(c, "ctx->npc");
-        break;
     case IMM_CONSTEXT:
         EMIT(c, "insn->extension_valid");
         break;
Signature · 1 line
2.39.0
Tested-by Reviewed-by on v1 1/1
#1 lore raw
Quoted 13 lines

-----Original Message-----
From: Anton Johansson <[email protected]>
Sent: Tuesday, January 31, 2023 4:32 PM
To: [email protected]
Cc: [email protected]; Taylor Simpson <[email protected]>; Brian Cain <[email protected]>; Michael Lambert <[email protected]>
Subject: [PATCH] target/hexagon/idef-parser: Remove unused code paths

Removes code paths used by COF instructions, which are no longer processed by idef-parser.

Quoted 9 lines
---
 target/hexagon/idef-parser/idef-parser.h    |  1 -
 target/hexagon/idef-parser/idef-parser.lex  | 27 +------------
 target/hexagon/idef-parser/idef-parser.y    | 45 +--------------------
 target/hexagon/idef-parser/macros.inc       | 10 -----
 target/hexagon/idef-parser/parser-helpers.c |  3 --
 5 files changed, 4 insertions(+), 82 deletions(-)