From 4e939a7b4d33088bda1fe0c2871be2bf61276e21 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Thu, 24 Aug 2017 17:06:36 -0700 Subject: [PATCH] x86: Use the new CondInst format for moves to/from control registers. The condition is whether the control register index is valid. Change-Id: I8a225fcfd4955032b5bbf7d3392ee5bcc7d6bc64 Reviewed-on: https://gem5-review.googlesource.com/4581 Reviewed-by: Michael LeBeane Maintainer: Gabe Black --- src/arch/x86/isa/decoder/two_byte_opcodes.isa | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/arch/x86/isa/decoder/two_byte_opcodes.isa b/src/arch/x86/isa/decoder/two_byte_opcodes.isa index 97c3dd688..8b8756823 100644 --- a/src/arch/x86/isa/decoder/two_byte_opcodes.isa +++ b/src/arch/x86/isa/decoder/two_byte_opcodes.isa @@ -360,9 +360,11 @@ 0x04: decode LEGACY_DECODEVAL { // no prefix 0x0: decode OPCODE_OP_BOTTOM3 { - 0x0: MOV(Rd,Cd); + 0x0: CondInst::MOV( + {{isValidMiscReg(MISCREG_CR(MODRM_RM))}},Rd,Cd); 0x1: MOV(Rd,Dd); - 0x2: MOV(Cd,Rd); + 0x2: CondInst::MOV( + {{isValidMiscReg(MISCREG_CR(MODRM_REG))}},Cd,Rd); 0x3: MOV(Dd,Rd); default: UD2(); } -- 2.30.2