[Qemu-devel] [PULL 0/3] m68k queue

[Qemu-devel] [PULL 0/3] m68k queue

[Laurent Vivier]

The following changes since commit 2b464e13f0d30e6c0b8f69ec908fceab30aea986:

  Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150629' into staging (2015-06-29 13:26:43 +0100)

are available in the git repository at:

  git@github.com:vivier/qemu-m68k.git tags/pull-m68k-20150629

for you to fetch changes up to a435612616202c837d62626dbe3e33a4e9a95772:

  m68k: remove useless parameter op_size from gen_lea_indexed() (2015-06-29 17:11:57 +0200)

----------------------------------------------------------------
Trivial m68k cleanup

----------------------------------------------------------------
Laurent Vivier (3):
      m68k: is_mem is useless
      m68k: remove useless file m68k-qreg.h
      m68k: remove useless parameter op_size from gen_lea_indexed()

 target-m68k/m68k-qreg.h | 11 -----------
 target-m68k/translate.c | 14 +++-----------
 2 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 target-m68k/m68k-qreg.h

[Qemu-devel] [PULL 1/3] m68k: is_mem is useless

[Laurent Vivier]

Remove is_mem as it is never tested anymore since:

    commit bfa50bc2638d877cf2900712b7503be22e8811cb
    Author: aliguori <aliguori@c046a42c-6fe2-441c-8c8c-71466251a162>
    Date:   Tue Nov 18 20:26:41 2008 +0000

        Remove premature memop TB terminations (Jan Kiszka)

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
---
 target-m68k/translate.c | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index d6c478f..1f9b7fe 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -129,7 +129,6 @@ typedef struct DisasContext {
     uint32_t fpcr;
     struct TranslationBlock *tb;
     int singlestep_enabled;
-    int is_mem;
     TCGv_i64 mactmp;
     int done_mac;
 } DisasContext;
@@ -179,7 +178,6 @@ static inline TCGv gen_load(DisasContext * s, int opsize, TCGv addr, int sign)
 {
     TCGv tmp;
     int index = IS_USER(s);
-    s->is_mem = 1;
     tmp = tcg_temp_new_i32();
     switch(opsize) {
     case OS_BYTE:
@@ -209,7 +207,6 @@ static inline TCGv_i64 gen_load64(DisasContext * s, TCGv addr)
 {
     TCGv_i64 tmp;
     int index = IS_USER(s);
-    s->is_mem = 1;
     tmp = tcg_temp_new_i64();
     tcg_gen_qemu_ldf64(tmp, addr, index);
     gen_throws_exception = gen_last_qop;
@@ -220,7 +217,6 @@ static inline TCGv_i64 gen_load64(DisasContext * s, TCGv addr)
 static inline void gen_store(DisasContext *s, int opsize, TCGv addr, TCGv val)
 {
     int index = IS_USER(s);
-    s->is_mem = 1;
     switch(opsize) {
     case OS_BYTE:
         tcg_gen_qemu_st8(val, addr, index);
@@ -241,7 +237,6 @@ static inline void gen_store(DisasContext *s, int opsize, TCGv addr, TCGv val)
 static inline void gen_store64(DisasContext *s, TCGv addr, TCGv_i64 val)
 {
     int index = IS_USER(s);
-    s->is_mem = 1;
     tcg_gen_qemu_stf64(val, addr, index);
     gen_throws_exception = gen_last_qop;
 }
@@ -2227,7 +2222,6 @@ DISAS_INSN(fpu)
             mask = 0x80;
             for (i = 0; i < 8; i++) {
                 if (ext & mask) {
-                    s->is_mem = 1;
                     dest = FREG(i, 0);
                     if (ext & (1 << 13)) {
                         /* store */
@@ -2999,7 +2993,6 @@ gen_intermediate_code_internal(M68kCPU *cpu, TranslationBlock *tb,
     dc->singlestep_enabled = cs->singlestep_enabled;
     dc->fpcr = env->fpcr;
     dc->user = (env->sr & SR_S) == 0;
-    dc->is_mem = 0;
     dc->done_mac = 0;
     lj = -1;
     num_insns = 0;
-- 
2.4.3

[Qemu-devel] [PULL 2/3] m68k: remove useless file m68k-qreg.h

[Laurent Vivier]

Unused since:

    commit e1f3808e03f73e7a7fa966afbed2455dd052202e
    Author: pbrook <pbrook@c046a42c-6fe2-441c-8c8c-71466251a162>
    Date:   Sat May 24 22:29:16 2008 +0000

        Convert m68k target to TCG.

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
---
 target-m68k/m68k-qreg.h | 11 -----------
 1 file changed, 11 deletions(-)
 delete mode 100644 target-m68k/m68k-qreg.h

diff --git a/target-m68k/m68k-qreg.h b/target-m68k/m68k-qreg.h
deleted file mode 100644
index c224d5e..0000000
--- a/target-m68k/m68k-qreg.h
+++ /dev/null
@@ -1,11 +0,0 @@
-enum {
-#define DEFO32(name, offset) QREG_##name,
-#define DEFR(name, reg, mode) QREG_##name,
-#define DEFF64(name, offset) QREG_##name,
-    QREG_NULL,
-#include "qregs.def"
-    TARGET_NUM_QREGS = 0x100
-#undef DEFO32
-#undef DEFR
-#undef DEFF64
-};
-- 
2.4.3

[Qemu-devel] [PULL 3/3] m68k: remove useless parameter op_size from gen_lea_indexed()

[Laurent Vivier]

Signed-off-by: Laurent Vivier <laurent@vivier.eu>
Reviewed-by: Thomas Huth <huth@tuxfamily.org>
---
 target-m68k/translate.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index 1f9b7fe..a57d241 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -292,8 +292,7 @@ static TCGv gen_addr_index(uint16_t ext, TCGv tmp)
 
 /* Handle a base + index + displacement effective addresss.
    A NULL_QREG base means pc-relative.  */
-static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, int opsize,
-                            TCGv base)
+static TCGv gen_lea_indexed(CPUM68KState *env, DisasContext *s, TCGv base)
 {
     uint32_t offset;
     uint16_t ext;
@@ -524,7 +523,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn,
         return tmp;
     case 6: /* Indirect index + displacement.  */
         reg = AREG(insn, 0);
-        return gen_lea_indexed(env, s, opsize, reg);
+        return gen_lea_indexed(env, s, reg);
     case 7: /* Other */
         switch (insn & 7) {
         case 0: /* Absolute short.  */
@@ -540,7 +539,7 @@ static TCGv gen_lea(CPUM68KState *env, DisasContext *s, uint16_t insn,
             s->pc += 2;
             return tcg_const_i32(offset);
         case 3: /* pc index+displacement.  */
-            return gen_lea_indexed(env, s, opsize, NULL_QREG);
+            return gen_lea_indexed(env, s, NULL_QREG);
         case 4: /* Immediate.  */
         default:
             return NULL_QREG;
-- 
2.4.3

Re: [Qemu-devel] [PULL 0/3] m68k queue

[Peter Maydell]

On 29 June 2015 at 16:44, Laurent Vivier <laurent@vivier.eu> wrote:
> The following changes since commit 2b464e13f0d30e6c0b8f69ec908fceab30aea986:
>
>   Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150629' into staging (2015-06-29 13:26:43 +0100)
>
> are available in the git repository at:
>
>   git@github.com:vivier/qemu-m68k.git tags/pull-m68k-20150629

This should probably read https://github.com/vivier/qemu-m68k.git tags/...
My pull request workflow includes just cut-n-pasting the line here,
so it's awkward if it's not a valid git remote URL. If you can fix
this for next time you send a pull request email that would be helpful.


> for you to fetch changes up to a435612616202c837d62626dbe3e33a4e9a95772:
>
>   m68k: remove useless parameter op_size from gen_lea_indexed() (2015-06-29 17:11:57 +0200)
>
> ----------------------------------------------------------------
> Trivial m68k cleanup
>
> ----------------------------------------------------------------

Applied, thanks.

-- PMM

Re: [Qemu-devel] [PULL 0/3] m68k queue

[Laurent Vivier]

Le 29/06/2015 19:00, Peter Maydell a écrit :
> On 29 June 2015 at 16:44, Laurent Vivier <laurent@vivier.eu> wrote:
>> The following changes since commit 2b464e13f0d30e6c0b8f69ec908fceab30aea986:
>>
>>   Merge remote-tracking branch 'remotes/bkoppelmann/tags/pull-tricore-20150629' into staging (2015-06-29 13:26:43 +0100)
>>
>> are available in the git repository at:
>>
>>   git@github.com:vivier/qemu-m68k.git tags/pull-m68k-20150629
> 
> This should probably read https://github.com/vivier/qemu-m68k.git tags/...
> My pull request workflow includes just cut-n-pasting the line here,
> so it's awkward if it's not a valid git remote URL. If you can fix
> this for next time you send a pull request email that would be helpful.

I've modified the script. Thank you.

Laurent