[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 10/17] target-m68k: Replace qemu_assert by hw_error
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 10/17] target-m68k: Replace qemu_assert by hw_error |
Date: |
Sat, 28 Dec 2013 02:07:23 +0400 |
From: Stefan Weil <address@hidden>
hw_error is already used for target-arm and target-s390x.
Using it for target-m68k fixes this compiler warning with Darwin because
hw_error is declared with QEMU_NORETURN:
target-m68k/translate.c:671:13: warning:
variable 'offset' is used uninitialized whenever switch default is taken
[-Wsometimes-uninitialized]
Signed-off-by: Stefan Weil <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
target-m68k/translate.c | 28 +++++++++-------------------
1 file changed, 9 insertions(+), 19 deletions(-)
diff --git a/target-m68k/translate.c b/target-m68k/translate.c
index f54b94a..259788e 100644
--- a/target-m68k/translate.c
+++ b/target-m68k/translate.c
@@ -110,14 +110,6 @@ void m68k_tcg_init(void)
store_dummy = tcg_global_mem_new(TCG_AREG0, -8, "NULL");
}
-static inline void qemu_assert(int cond, const char *msg)
-{
- if (!cond) {
- fprintf (stderr, "badness: %s\n", msg);
- abort();
- }
-}
-
/* internal defines */
typedef struct DisasContext {
CPUM68KState *env;
@@ -199,7 +191,7 @@ static inline TCGv gen_load(DisasContext * s, int opsize,
TCGv addr, int sign)
tcg_gen_qemu_ld32u(tmp, addr, index);
break;
default:
- qemu_assert(0, "bad load size");
+ hw_error("%s: Bad load size\n", __func__);
}
gen_throws_exception = gen_last_qop;
return tmp;
@@ -233,7 +225,7 @@ static inline void gen_store(DisasContext *s, int opsize,
TCGv addr, TCGv val)
tcg_gen_qemu_st32(val, addr, index);
break;
default:
- qemu_assert(0, "bad store size");
+ hw_error("%s: Bad store size\n", __func__);
}
gen_throws_exception = gen_last_qop;
}
@@ -437,8 +429,7 @@ static inline int opsize_bytes(int opsize)
case OS_SINGLE: return 4;
case OS_DOUBLE: return 8;
default:
- qemu_assert(0, "bad operand size");
- return 0;
+ hw_error("%s: Bad operand size\n", __func__);
}
}
@@ -465,8 +456,7 @@ static void gen_partset_reg(int opsize, TCGv reg, TCGv val)
tcg_gen_mov_i32(reg, val);
break;
default:
- qemu_assert(0, "Bad operand size");
- break;
+ hw_error("%s: Bad operand size\n", __func__);
}
}
@@ -495,7 +485,7 @@ static inline TCGv gen_extend(TCGv val, int opsize, int
sign)
tmp = val;
break;
default:
- qemu_assert(0, "Bad operand size");
+ hw_error("%s: Bad operand size\n", __func__);
}
return tmp;
}
@@ -669,7 +659,7 @@ static TCGv gen_ea(CPUM68KState *env, DisasContext *s,
uint16_t insn,
offset = read_im32(env, s);
break;
default:
- qemu_assert(0, "Bad immediate operand");
+ hw_error("%s: Bad immediate operand\n", __func__);
}
return tcg_const_i32(offset);
default:
@@ -2092,7 +2082,7 @@ DISAS_INSN(wdebug)
return;
}
/* TODO: Implement wdebug. */
- qemu_assert(0, "WDEBUG not implemented");
+ hw_error("%s: Not implemented\n", __func__);
}
DISAS_INSN(trap)
@@ -2467,13 +2457,13 @@ DISAS_INSN(fbcc)
DISAS_INSN(frestore)
{
/* TODO: Implement frestore. */
- qemu_assert(0, "FRESTORE not implemented");
+ hw_error("%s: Not implemented\n", __func__);
}
DISAS_INSN(fsave)
{
/* TODO: Implement fsave. */
- qemu_assert(0, "FSAVE not implemented");
+ hw_error("%s: Not implemented\n", __func__);
}
static inline TCGv gen_mac_extract_word(DisasContext *s, TCGv val, int upper)
--
1.7.10.4
- [Qemu-trivial] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps, (continued)
- [Qemu-trivial] [PULL 15/17] pxa27x: Add 'const' attribute to keyboard maps, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 06/17] linux-user: Use macro TARGET_NSIG_WORDS where possible, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 11/17] configure: Rewrite code for help message, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 12/17] configure: Python tests must be done before help message, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 09/17] fix -boot strict regressed in commit 6ef4716, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 17/17] acpi unit-test: Remove temporary disk after test, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 04/17] ui/cocoa: Use macro ARRAY_SIZE where possible, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 14/17] pxa27x: Reduce size of keyboard matrix mapping, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 16/17] mainstone: Fix duplicate array values for key 'space', Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 13/17] doc: Mention chardev:id in available devices for -serial, Michael Tokarev, 2013/12/27
- [Qemu-trivial] [PULL 10/17] target-m68k: Replace qemu_assert by hw_error,
Michael Tokarev <=