[v2] m68k: implement movep instruction

Commit Message

Pavel Dovgalyuk Feb. 6, 2018, 11:19 a.m. UTC

This patch implements movep instruction. It moves data between a data register
and alternate bytes within the address space starting at the location
specified and incrementing by two.

It was designed for the original 68000 and used in firmwares for
interfacing the 8-bit peripherals through the 16-bit data bus.
Without this patch opcode for this instruction is recognized as some bitop.

Signed-off-by: Pavel Dovgalyuk <[e-mail]>
Signed-off-by: Mihail Abakumov <[e-mail]>

--

v2: - disabled movep for Coldfire
    - fixed gen_store/load usage
---
 target/m68k/cpu.c       |    3 +++
 target/m68k/cpu.h       |    1 +
 target/m68k/translate.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+)

Comments

Laurent Vivier Feb. 6, 2018, 11:22 a.m. UTC | #1

Le 06/02/2018 à 12:19, Pavel Dovgalyuk a écrit :
> This patch implements movep instruction. It moves data between a data register
> and alternate bytes within the address space starting at the location
> specified and incrementing by two.
> 
> It was designed for the original 68000 and used in firmwares for
> interfacing the 8-bit peripherals through the 16-bit data bus.
> Without this patch opcode for this instruction is recognized as some bitop.
> 
> Signed-off-by: Pavel Dovgalyuk <[e-mail]>
> Signed-off-by: Mihail Abakumov <[e-mail]>
> 
> --
> 
> v2: - disabled movep for Coldfire
>     - fixed gen_store/load usage
> ---
>  target/m68k/cpu.c       |    3 +++
>  target/m68k/cpu.h       |    1 +
>  target/m68k/translate.c |   53 +++++++++++++++++++++++++++++++++++++++++++++++
>  3 files changed, 57 insertions(+)
> 
> diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
> index 98919b3..2b38b9b 100644
> --- a/target/m68k/cpu.c
> +++ b/target/m68k/cpu.c
> @@ -113,6 +113,7 @@ static void m68000_cpu_initfn(Object *obj)
>      m68k_set_feature(env, M68K_FEATURE_M68000);
>      m68k_set_feature(env, M68K_FEATURE_USP);
>      m68k_set_feature(env, M68K_FEATURE_WORD_INDEX);
> +    m68k_set_feature(env, M68K_FEATURE_MOVEP);
>  }
>  
>  static void m68020_cpu_initfn(Object *obj)
> @@ -135,6 +136,7 @@ static void m68020_cpu_initfn(Object *obj)
>      m68k_set_feature(env, M68K_FEATURE_BKPT);
>      m68k_set_feature(env, M68K_FEATURE_RTD);
>      m68k_set_feature(env, M68K_FEATURE_CHK2);
> +    m68k_set_feature(env, M68K_FEATURE_MOVEP);
>  }
>  #define m68030_cpu_initfn m68020_cpu_initfn
>  
> @@ -145,6 +147,7 @@ static void m68040_cpu_initfn(Object *obj)
>  
>      m68020_cpu_initfn(obj);
>      m68k_set_feature(env, M68K_FEATURE_M68040);
> +    m68k_set_feature(env, M68K_FEATURE_MOVEP);

You don't need to add it here as it comes with m68020_cpu_initfn().

Thanks,
Laurent

Patch

diff --git a/target/m68k/cpu.c b/target/m68k/cpu.c
index 98919b3..2b38b9b 100644
--- a/target/m68k/cpu.c
+++ b/target/m68k/cpu.c
@@ -113,6 +113,7 @@  static void m68000_cpu_initfn(Object *obj)
     m68k_set_feature(env, M68K_FEATURE_M68000);
     m68k_set_feature(env, M68K_FEATURE_USP);
     m68k_set_feature(env, M68K_FEATURE_WORD_INDEX);
+    m68k_set_feature(env, M68K_FEATURE_MOVEP);
 }
 
 static void m68020_cpu_initfn(Object *obj)
@@ -135,6 +136,7 @@  static void m68020_cpu_initfn(Object *obj)
     m68k_set_feature(env, M68K_FEATURE_BKPT);
     m68k_set_feature(env, M68K_FEATURE_RTD);
     m68k_set_feature(env, M68K_FEATURE_CHK2);
+    m68k_set_feature(env, M68K_FEATURE_MOVEP);
 }
 #define m68030_cpu_initfn m68020_cpu_initfn
 
@@ -145,6 +147,7 @@  static void m68040_cpu_initfn(Object *obj)
 
     m68020_cpu_initfn(obj);
     m68k_set_feature(env, M68K_FEATURE_M68040);
+    m68k_set_feature(env, M68K_FEATURE_MOVEP);
 }
 
 static void m68060_cpu_initfn(Object *obj)
diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h
index 627fb78..1d79885 100644
--- a/target/m68k/cpu.h
+++ b/target/m68k/cpu.h
@@ -492,6 +492,7 @@  enum m68k_features {
     M68K_FEATURE_RTD,
     M68K_FEATURE_CHK2,
     M68K_FEATURE_M68040, /* instructions specific to MC68040 */
+    M68K_FEATURE_MOVEP,
 };
 
 static inline int m68k_feature(CPUM68KState *env, int feature)
diff --git a/target/m68k/translate.c b/target/m68k/translate.c
index 34db97b..ddb5b34 100644
--- a/target/m68k/translate.c
+++ b/target/m68k/translate.c
@@ -2078,6 +2078,55 @@  DISAS_INSN(movem)
     tcg_temp_free(addr);
 }
 
+DISAS_INSN(movep)
+{
+    uint8_t i;
+    uint8_t op;
+    uint16_t displ;
+    TCGv reg;
+    TCGv addr;
+    TCGv abuf;
+    TCGv dbuf;
+
+    op = (insn >> 6) & 7;
+    displ = read_im16(env, s);
+
+    addr = AREG(insn, 0);
+    reg = DREG(insn, 9);
+
+    abuf = tcg_temp_new();
+    tcg_gen_addi_i32(abuf, addr, displ);
+    dbuf = tcg_temp_new();
+
+    if (op & 1) {
+        i = 4;
+    } else {
+        i = 2;
+    }
+
+    if (op & 2) {
+        for ( ; i > 0 ; i--) {
+            tcg_gen_shri_i32(dbuf, reg, (i - 1) * 8);
+            gen_store(s, OS_BYTE, abuf, dbuf, IS_USER(s));
+            if (i > 1) {
+                tcg_gen_addi_i32(abuf, abuf, 2);
+            }
+        }
+    } else {
+        tcg_gen_movi_i32(reg, 0);
+        for ( ; i > 0 ; i--) {
+            dbuf = gen_load(s, OS_BYTE, abuf, 1, IS_USER(s));
+            tcg_gen_or_i32(reg, reg, dbuf);
+            if (i > 1) {
+                tcg_gen_shli_i32(reg, reg, 8);
+                tcg_gen_addi_i32(abuf, abuf, 2);
+            }
+        }
+    }
+    tcg_temp_free(abuf);
+    tcg_temp_free(dbuf);
+}
+
 DISAS_INSN(bitop_im)
 {
     int opsize;
@@ -5675,9 +5724,13 @@  void register_m68k_insns (CPUM68KState *env)
     INSN(chk2,      00c0, f9c0, CHK2);
     INSN(bitrev,    00c0, fff8, CF_ISA_APLUSC);
     BASE(bitop_reg, 0100, f1c0);
+    INSN(movep,     0108, f1f8, MOVEP);
     BASE(bitop_reg, 0140, f1c0);
+    INSN(movep,     0148, f1f8, MOVEP);
     BASE(bitop_reg, 0180, f1c0);
+    INSN(movep,     0188, f1f8, MOVEP);
     BASE(bitop_reg, 01c0, f1c0);
+    INSN(movep,     01c8, f1f8, MOVEP);
     INSN(arith_im,  0280, fff8, CF_ISA_A);
     INSN(arith_im,  0200, ff00, M68000);
     INSN(undef,     02c0, ffc0, M68000);