[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 40/77] target/microblaze: Convert dec_and, dec_or, dec_xor to dec
From: |
Richard Henderson |
Subject: |
[PATCH 40/77] target/microblaze: Convert dec_and, dec_or, dec_xor to decodetree |
Date: |
Tue, 25 Aug 2020 13:59:13 -0700 |
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
target/microblaze/insns.decode | 12 ++++++++++
target/microblaze/translate.c | 44 ++++++++++++----------------------
2 files changed, 27 insertions(+), 29 deletions(-)
diff --git a/target/microblaze/insns.decode b/target/microblaze/insns.decode
index 8d3de039fb..6b3cc9a182 100644
--- a/target/microblaze/insns.decode
+++ b/target/microblaze/insns.decode
@@ -38,9 +38,18 @@ addic 001010 ..... ..... ................
@typeb
addik 001100 ..... ..... ................ @typeb
addikc 001110 ..... ..... ................ @typeb
+and 100001 ..... ..... ..... 000 0000 0000 @typea
+andi 101001 ..... ..... ................ @typeb
+
+andn 100011 ..... ..... ..... 000 0000 0000 @typea
+andni 101011 ..... ..... ................ @typeb
+
cmp 000101 ..... ..... ..... 000 0000 0001 @typea
cmpu 000101 ..... ..... ..... 000 0000 0011 @typea
+or 100000 ..... ..... ..... 000 0000 0000 @typea
+ori 101000 ..... ..... ................ @typeb
+
pcmpbf 100000 ..... ..... ..... 100 0000 0000 @typea
pcmpeq 100010 ..... ..... ..... 100 0000 0000 @typea
pcmpne 100011 ..... ..... ..... 100 0000 0000 @typea
@@ -54,3 +63,6 @@ rsubi 001001 ..... ..... ................ @typeb
rsubic 001011 ..... ..... ................ @typeb
rsubik 001101 ..... ..... ................ @typeb
rsubikc 001111 ..... ..... ................ @typeb
+
+xor 100010 ..... ..... ..... 000 0000 0000 @typea
+xori 101010 ..... ..... ................ @typeb
diff --git a/target/microblaze/translate.c b/target/microblaze/translate.c
index de2cf5b153..5252790b09 100644
--- a/target/microblaze/translate.c
+++ b/target/microblaze/translate.c
@@ -331,6 +331,16 @@ DO_TYPEBV(addic, true, gen_addc)
DO_TYPEBI(addik, false, tcg_gen_addi_i32)
DO_TYPEBV(addikc, true, gen_addkc)
+static void gen_andni(TCGv_i32 out, TCGv_i32 ina, int32_t imm)
+{
+ tcg_gen_andi_i32(out, ina, ~imm);
+}
+
+DO_TYPEA(and, false, tcg_gen_and_i32)
+DO_TYPEBI(andi, false, tcg_gen_andi_i32)
+DO_TYPEA(andn, false, tcg_gen_andc_i32)
+DO_TYPEBI(andni, false, gen_andni)
+
static void gen_cmp(TCGv_i32 out, TCGv_i32 ina, TCGv_i32 inb)
{
TCGv_i32 lt = tcg_temp_new_i32();
@@ -354,6 +364,9 @@ static void gen_cmpu(TCGv_i32 out, TCGv_i32 ina, TCGv_i32
inb)
DO_TYPEA(cmp, false, gen_cmp)
DO_TYPEA(cmpu, false, gen_cmpu)
+DO_TYPEA(or, false, tcg_gen_or_i32)
+DO_TYPEBI(ori, false, tcg_gen_ori_i32)
+
static void gen_pcmpeq(TCGv_i32 out, TCGv_i32 ina, TCGv_i32 inb)
{
tcg_gen_setcond_i32(TCG_COND_EQ, out, ina, inb);
@@ -417,32 +430,8 @@ DO_TYPEBV(rsubic, true, gen_rsubc)
DO_TYPEBV(rsubik, false, gen_rsubk)
DO_TYPEBV(rsubikc, true, gen_rsubkc)
-static void dec_and(DisasContext *dc)
-{
- unsigned int not;
-
- not = dc->opcode & (1 << 1);
-
- if (!dc->rd)
- return;
-
- if (not) {
- tcg_gen_andc_i32(cpu_R[dc->rd], cpu_R[dc->ra], *(dec_alu_op_b(dc)));
- } else
- tcg_gen_and_i32(cpu_R[dc->rd], cpu_R[dc->ra], *(dec_alu_op_b(dc)));
-}
-
-static void dec_or(DisasContext *dc)
-{
- if (dc->rd)
- tcg_gen_or_i32(cpu_R[dc->rd], cpu_R[dc->ra], *(dec_alu_op_b(dc)));
-}
-
-static void dec_xor(DisasContext *dc)
-{
- if (dc->rd)
- tcg_gen_xor_i32(cpu_R[dc->rd], cpu_R[dc->ra], *(dec_alu_op_b(dc)));
-}
+DO_TYPEA(xor, false, tcg_gen_xor_i32)
+DO_TYPEBI(xori, false, tcg_gen_xori_i32)
static void msr_read(DisasContext *dc, TCGv_i32 d)
{
@@ -1567,9 +1556,6 @@ static struct decoder_info {
};
void (*dec)(DisasContext *dc);
} decinfo[] = {
- {DEC_AND, dec_and},
- {DEC_XOR, dec_xor},
- {DEC_OR, dec_or},
{DEC_BIT, dec_bit},
{DEC_BARREL, dec_barrel},
{DEC_LD, dec_load},
--
2.25.1
- [PATCH 33/77] target/microblaze: Remove LOG_DIS, (continued)
- [PATCH 33/77] target/microblaze: Remove LOG_DIS, Richard Henderson, 2020/08/25
- [PATCH 36/77] target/microblaze: Convert dec_add to decodetree, Richard Henderson, 2020/08/25
- [PATCH 37/77] target/microblaze: Convert dec_sub to decodetree, Richard Henderson, 2020/08/25
- [PATCH 28/77] target/microblaze: Convert to DisasContextBase, Richard Henderson, 2020/08/25
- [PATCH 31/77] target/microblaze: Remove DISAS_GNU, Richard Henderson, 2020/08/25
- [PATCH 34/77] target/microblaze: Ensure imm constant is always available, Richard Henderson, 2020/08/25
- [PATCH 35/77] target/microblaze: Add decodetree infrastructure, Richard Henderson, 2020/08/25
- [PATCH 38/77] target/microblaze: Implement cmp and cmpu inline, Richard Henderson, 2020/08/25
- [PATCH 39/77] target/microblaze: Convert dec_pattern to decodetree, Richard Henderson, 2020/08/25
- [PATCH 42/77] target/microblaze: Convert dec_div to decodetree, Richard Henderson, 2020/08/25
- [PATCH 40/77] target/microblaze: Convert dec_and, dec_or, dec_xor to decodetree,
Richard Henderson <=
- [PATCH 43/77] target/microblaze: Unwind properly when raising divide-by-zero, Richard Henderson, 2020/08/25
- [PATCH 41/77] target/microblaze: Convert dec_mul to decodetree, Richard Henderson, 2020/08/25
- [PATCH 44/77] target/microblaze: Convert dec_bit to decodetree, Richard Henderson, 2020/08/25
- [PATCH 45/77] target/microblaze: Convert dec_barrel to decodetree, Richard Henderson, 2020/08/25
- [PATCH 47/77] target/microblaze: Convert dec_fpu to decodetree, Richard Henderson, 2020/08/25
- [PATCH 46/77] target/microblaze: Convert dec_imm to decodetree, Richard Henderson, 2020/08/25
- [PATCH 48/77] target/microblaze: Fix cpu unwind for fpu exceptions, Richard Henderson, 2020/08/25
- [PATCH 49/77] target/microblaze: Mark fpu helpers TCG_CALL_NO_WG, Richard Henderson, 2020/08/25
- [PATCH 50/77] target/microblaze: Replace MSR_EE_FLAG with MSR_EE, Richard Henderson, 2020/08/25
- [PATCH 51/77] target/microblaze: Cache mem_index in DisasContext, Richard Henderson, 2020/08/25