diff --git a/icache.vhdl b/icache.vhdl index 6383726..e01eb35 100644 --- a/icache.vhdl +++ b/icache.vhdl @@ -625,7 +625,7 @@ begin end if; i_out.insn <= insn(31 downto 0); i_out.icode <= icode; - log_insn <= cache_wr_data(35 downto 0); + log_insn <= insn; i_out.valid <= r.hit_valid; i_out.nia <= r.hit_nia; i_out.stop_mark <= r.hit_smark; diff --git a/scripts/fmt_log/fmt_log.c b/scripts/fmt_log/fmt_log.c index e92ecba..e15d42d 100644 --- a/scripts/fmt_log/fmt_log.c +++ b/scripts/fmt_log/fmt_log.c @@ -83,15 +83,15 @@ struct log_entry { #define FLGA(i, y, z) (log.i? y: z) #define PNIA(f) (full_nia[log.f] & 0xff) -const char *units[4] = { "--", "al", "ls", "fp" }; +const char *units[4] = { "al", "ls", "fp", "3?" }; const char *ops[64] = { - "illegal", "nop ", "add ", "and ", "attn ", "b ", "bc ", "bcreg ", - "bcd ", "bperm ", "cmp ", "cmpb ", "cmpeqb ", "cmprb ", "cntz ", "crop ", + "illegal", "nop ", "add ", "attn ", "b ", "bc ", "bcreg ", "bcd ", + "bperm ", "brev ", "cmp ", "cmpb ", "cmpeqb ", "cmprb ", "cntz ", "crop ", "darn ", "dcbf ", "dcbst ", "dcbt ", "dcbtst ", "dcbz ", "icbi ", "icbt ", "fpcmp ", "fparith", "fpmove ", "fpmisc ", "div ", "dive ", "mod ", "exts ", - "extswsl", "isel ", "isync ", "ld ", "st ", "mcrxrx ", "mfcr ", "mfmsr ", - "mfspr ", "mtcrf ", "mtmsr ", "mtspr ", "mull64 ", "mulh64 ", "mulh32 ", "or ", + "extswsl", "isel ", "isync ", "logic ", "ld ", "st ", "mcrxrx ", "mfcr ", + "mfmsr ", "mfspr ", "mtcrf ", "mtmsr ", "mtspr ", "mull64 ", "mulh64 ", "mulh32 ", "popcnt ", "prty ", "rfid ", "rlc ", "rlcl ", "rlcr ", "sc ", "setb ", "shl ", "shr ", "sync ", "tlbie ", "trap ", "xor ", "addg6s ", "ffail ", };