From 6ce15b77d086f4f2d0b945b032fbaa2096f2ef6f Mon Sep 17 00:00:00 2001 From: Michael Nolan Date: Tue, 19 May 2020 15:32:56 -0400 Subject: [PATCH] Fix opcodes for TWI, TDI, TW, and TD --- openpower/isatables/major.csv | 3 ++- openpower/isatables/minor_31.csv | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/openpower/isatables/major.csv b/openpower/isatables/major.csv index a54f00e5f..8107ec2c8 100644 --- a/openpower/isatables/major.csv +++ b/openpower/isatables/major.csv @@ -30,6 +30,7 @@ opcode,unit,internal op,in1,in2,in3,out,CR in,CR out,inv A,inv out,cry in,cry ou 36,LDST,OP_STORE,RA_OR_ZERO,CONST_SI,RS,NONE,0,0,0,0,ZERO,0,is4B,0,0,0,0,0,0,NONE,0,1,stw,D 37,LDST,OP_STORE,RA_OR_ZERO,CONST_SI,RS,NONE,0,0,0,0,ZERO,0,is4B,0,0,1,0,0,0,NONE,0,1,stwu,D 8,ALU,OP_ADD,RA,CONST_SI,NONE,RT,0,0,1,0,ONE,1,NONE,0,0,0,0,0,0,NONE,0,0,subfic,D -2,ALU,OP_TDI,RA,CONST_SI,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,1,tdi,D +2,TRAP,OP_TRAP,RA,CONST_SI,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,1,tdi,D +3,TRAP,OP_TRAP,RA,CONST_SI,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,1,0,NONE,0,1,twi,D 26,LOGICAL,OP_XOR,NONE,CONST_UI,RS,RA,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,xori,D 27,LOGICAL,OP_XOR,NONE,CONST_UI_HI,RS,RA,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,0,xoris,D diff --git a/openpower/isatables/minor_31.csv b/openpower/isatables/minor_31.csv index 88954ac0f..409a645ac 100644 --- a/openpower/isatables/minor_31.csv +++ b/openpower/isatables/minor_31.csv @@ -171,6 +171,6 @@ opcode,unit,internal op,in1,in2,in3,out,CR in,CR out,inv A,inv out,cry in,cry ou 0b0011001000,ALU,OP_ADD,RA,NONE,NONE,RT,0,0,1,0,CA,1,NONE,0,0,0,0,0,0,RC,0,0,subfze,XO 0b1011001000,ALU,OP_ADD,RA,NONE,NONE,RT,0,0,1,0,CA,1,NONE,0,0,0,0,0,0,RC,0,0,subfzeo,XO 0b1001010110,ALU,OP_NOP,NONE,NONE,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,1,sync,X -0b0001000100,,,,,,,,,,,,,,,,,,,,,,,td,X -0b0000000100,ALU,OP_TW,RA,RB,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,1,tw,X +0b0001000100,TRAP,OP_TRAP,RA,RB,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,NONE,0,1,td,X +0b0000000100,TRAP,OP_TRAP,RA,RB,NONE,NONE,0,0,0,0,ZERO,0,NONE,0,0,0,0,1,0,NONE,0,1,tw,X 0b0100111100,LOGICAL,OP_XOR,NONE,RB,RS,RA,0,0,0,0,ZERO,0,NONE,0,0,0,0,0,0,RC,0,0,xor,X -- 2.30.2