From 99ad9aefac04879e343318be15eb7c31531a62a2 Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Wed, 1 Jul 2009 20:06:42 +0000 Subject: [PATCH] * cpu/mep-ivc2.cpu (cmov, cmovc, cmovh): Add intrinsic names to VLIW variants. (ivc2rm, ivc2crn): Make data type consistent with non-VLIW variants. --- ChangeLog | 5 +++++ cpu/mep-ivc2.cpu | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 963bcd9..8f125cc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-07-01 DJ Delorie + + * cpu/mep-ivc2.cpu (cmov, cmovc, cmovh): Add intrinsic names to VLIW variants. + (ivc2rm, ivc2crn): Make data type consistent with non-VLIW variants. + 2009-06-27 Doug Evans * gen-all-intrinsics: New file. diff --git a/cpu/mep-ivc2.cpu b/cpu/mep-ivc2.cpu index 815abfd..eeca567 100644 --- a/cpu/mep-ivc2.cpu +++ b/cpu/mep-ivc2.cpu @@ -299,8 +299,8 @@ (ifield f-ivc2-ccrn-lo)))) ) -(dnop ivc2rm "reg Rm" (all-mep-isas (CDATA REGNUM)) h-gpr f-ivc2-crm) -(dnop ivc2crn "copro Rn (0-31, 64-bit" (all-mep-isas (CDATA REGNUM)) h-cr64 f-ivc2-crnx) +(dnop ivc2rm "reg Rm" (all-mep-isas) h-gpr f-ivc2-crm) +(dnop ivc2crn "copro Rn (0-31, 64-bit" (all-mep-isas (CDATA CP_DATA_BUS_INT)) h-cr64 f-ivc2-crnx) (dnop ivc2ccrn "copro control reg CCRn" (all-mep-isas (CDATA REGNUM)) h-ccr-ivc2 f-ivc2-ccrn) (dnop ivc2c3ccrn "copro control reg CCRn" (all-mep-isas (CDATA REGNUM)) h-ccr-ivc2 f-ivc2-ccrn-c3) @@ -378,7 +378,7 @@ ; nnnnmmmm 11110000 0000N000 0000 cmov =crn,rm (dni cmov-crn-rm-p0 "cmov CRn,Rm" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmov1")) "cmov $ivc2crn,$ivc2rm" (+ ivc2crn ivc2rm (f-ivc2-cmov1 #xf00) (f-21 0) (f-ivc2-cmov2 #x00) (f-ivc2-cmov3 0)) (set ivc2crn ivc2rm) @@ -388,7 +388,7 @@ ; nnnnmmmm 11110000 0000N001 0000 cmov =rm,crn (dni cmov-rn-crm-p0 "cmov Rm,CRn" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmov2")) "cmov $ivc2rm,$ivc2crn" (+ ivc2crn ivc2rm (f-ivc2-cmov1 #xf00) (f-21 0) (f-ivc2-cmov2 #x10) (f-ivc2-cmov3 0)) (set ivc2rm ivc2crn) @@ -398,7 +398,7 @@ ; nnnnmmmm 11110000 0000NN10 0000 cmovc =ccrn,rm (dni cmovc-ccrn-rm-p0 "cmovc CCRn,Rm" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmovc1")) "cmovc $ivc2ccrn,$ivc2rm" (+ ivc2ccrn ivc2rm (f-ivc2-cmov1 #xf00) (f-ivc2-cmov2 #x20) (f-ivc2-cmov3 0)) (set ivc2ccrn ivc2rm) @@ -408,7 +408,7 @@ ; nnnnmmmm 11110000 0000NN11 0000 cmovc =rm,ccrn (dni cmovc-rn-ccrm-p0 "cmovc Rm,CCRn" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmovc2")) "cmovc $ivc2rm,$ivc2ccrn" (+ ivc2ccrn ivc2rm (f-ivc2-cmov1 #xf00) (f-ivc2-cmov2 #x30) (f-ivc2-cmov3 0)) (set ivc2rm ivc2ccrn) @@ -418,7 +418,7 @@ ; nnnnmmmm 11110001 0000N000 0000 cmovh =crn,rm (dni cmovh-crn-rm-p0 "cmovh CRn,Rm" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmovh1")) "cmovh $ivc2crn,$ivc2rm" (+ ivc2crn ivc2rm (f-ivc2-cmov1 #xf10) (f-21 0) (f-ivc2-cmov2 #x00) (f-ivc2-cmov3 0)) (set ivc2crn (or (sll (zext DI ivc2rm) 32) (and DI ivc2crn #xffffffff))) @@ -428,7 +428,7 @@ ; nnnnmmmm 11110001 0000N001 0000 cmovh =rm,crn (dni cmovh-rn-crm-p0 "cmovh Rm,CRn" - (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0)) + (OPTIONAL_CP_INSN ivc2-p0-isa (SLOTS P0) (INTRINSIC "cmovh2")) "cmovh $ivc2rm,$ivc2crn" (+ ivc2crn ivc2rm (f-ivc2-cmov1 #xf10) (f-21 0) (f-ivc2-cmov2 #x10) (f-ivc2-cmov3 0)) (set ivc2rm (srl ivc2crn 32)) -- 2.43.5