[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order
From: |
Michael Tokarev |
Subject: |
[Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order |
Date: |
Fri, 28 Oct 2016 18:18:35 +0300 |
From: Michael Walle <address@hidden>
The order of most opcodes with immediates was wrong (according to the
reference manual) in the (debug) logging. Additionally, one operand for the
andhi instruction was completly wrong. Fix these.
Signed-off-by: Michael Walle <address@hidden>
Reviewed-by: Peter Maydell <address@hidden>
Signed-off-by: Michael Tokarev <address@hidden>
---
target-lm32/translate.c | 34 +++++++++++++++++-----------------
1 file changed, 17 insertions(+), 17 deletions(-)
diff --git a/target-lm32/translate.c b/target-lm32/translate.c
index 534c17c..dc64cc6 100644
--- a/target-lm32/translate.c
+++ b/target-lm32/translate.c
@@ -211,7 +211,7 @@ static void dec_and(DisasContext *dc)
static void dec_andhi(DisasContext *dc)
{
- LOG_DIS("andhi r%d, r%d, %d\n", dc->r2, dc->r0, dc->imm16);
+ LOG_DIS("andhi r%d, r%d, %d\n", dc->r1, dc->r0, dc->imm16);
tcg_gen_andi_tl(cpu_R[dc->r1], cpu_R[dc->r0], (dc->imm16 << 16));
}
@@ -274,7 +274,7 @@ static inline void gen_cond_branch(DisasContext *dc, int
cond)
static void dec_be(DisasContext *dc)
{
- LOG_DIS("be r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("be r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16) * 4);
gen_cond_branch(dc, TCG_COND_EQ);
@@ -282,7 +282,7 @@ static void dec_be(DisasContext *dc)
static void dec_bg(DisasContext *dc)
{
- LOG_DIS("bg r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("bg r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16 * 4));
gen_cond_branch(dc, TCG_COND_GT);
@@ -290,7 +290,7 @@ static void dec_bg(DisasContext *dc)
static void dec_bge(DisasContext *dc)
{
- LOG_DIS("bge r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("bge r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16) * 4);
gen_cond_branch(dc, TCG_COND_GE);
@@ -298,7 +298,7 @@ static void dec_bge(DisasContext *dc)
static void dec_bgeu(DisasContext *dc)
{
- LOG_DIS("bgeu r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("bgeu r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16) * 4);
gen_cond_branch(dc, TCG_COND_GEU);
@@ -306,7 +306,7 @@ static void dec_bgeu(DisasContext *dc)
static void dec_bgu(DisasContext *dc)
{
- LOG_DIS("bgu r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("bgu r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16) * 4);
gen_cond_branch(dc, TCG_COND_GTU);
@@ -314,7 +314,7 @@ static void dec_bgu(DisasContext *dc)
static void dec_bne(DisasContext *dc)
{
- LOG_DIS("bne r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("bne r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16) * 4);
gen_cond_branch(dc, TCG_COND_NE);
@@ -367,7 +367,7 @@ static inline void gen_compare(DisasContext *dc, int cond)
static void dec_cmpe(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpei r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpei r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpe r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -379,7 +379,7 @@ static void dec_cmpe(DisasContext *dc)
static void dec_cmpg(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpgi r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpgi r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpg r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -391,7 +391,7 @@ static void dec_cmpg(DisasContext *dc)
static void dec_cmpge(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpgei r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpgei r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpge r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -403,7 +403,7 @@ static void dec_cmpge(DisasContext *dc)
static void dec_cmpgeu(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpgeui r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpgeui r%d, r%d, %d\n", dc->r1, dc->r0,
zero_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpgeu r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -415,7 +415,7 @@ static void dec_cmpgeu(DisasContext *dc)
static void dec_cmpgu(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpgui r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpgui r%d, r%d, %d\n", dc->r1, dc->r0,
zero_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpgu r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -427,7 +427,7 @@ static void dec_cmpgu(DisasContext *dc)
static void dec_cmpne(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("cmpnei r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("cmpnei r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16));
} else {
LOG_DIS("cmpne r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -539,7 +539,7 @@ static void dec_modu(DisasContext *dc)
static void dec_mul(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("muli r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("muli r%d, r%d, %d\n", dc->r1, dc->r0,
sign_extend(dc->imm16, 16));
} else {
LOG_DIS("mul r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -563,7 +563,7 @@ static void dec_mul(DisasContext *dc)
static void dec_nor(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("nori r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("nori r%d, r%d, %d\n", dc->r1, dc->r0,
zero_extend(dc->imm16, 16));
} else {
LOG_DIS("nor r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
@@ -959,7 +959,7 @@ static void dec_wcsr(DisasContext *dc)
static void dec_xnor(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("xnori r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("xnori r%d, r%d, %d\n", dc->r1, dc->r0,
zero_extend(dc->imm16, 16));
} else {
if (dc->r1 == R_R0) {
@@ -981,7 +981,7 @@ static void dec_xnor(DisasContext *dc)
static void dec_xor(DisasContext *dc)
{
if (dc->format == OP_FMT_RI) {
- LOG_DIS("xori r%d, r%d, %d\n", dc->r0, dc->r1,
+ LOG_DIS("xori r%d, r%d, %d\n", dc->r1, dc->r0,
zero_extend(dc->imm16, 16));
} else {
LOG_DIS("xor r%d, r%d, r%d\n", dc->r2, dc->r0, dc->r1);
--
2.1.4
- [Qemu-trivial] [PULL 07/23] lm32: milkymist-tmu2: fix integer overflow, (continued)
- [Qemu-trivial] [PULL 07/23] lm32: milkymist-tmu2: fix integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 01/23] filter-dump: add missing "[", Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 08/23] target-lm32: rewrite gen_compare(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 02/23] hw/tpm/tpm_passthrough: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 05/23] target-lm32: swap operand of wcsr in LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 19/23] qemu-ga: Remove stray 'q' in documentation, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 11/23] colo-compare: remove unused struct CompareChardevProps and 'props' variable, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 13/23] usb: Change *_exitfn return type from int to void, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 06/23] target-lm32: disable asm logging via LOG_DIS(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 17/23] s390: avoid always-true comparison in s390_pci_generate_fid(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 04/23] target-lm32: fix LOG_DIS operand order,
Michael Tokarev <=
- [Qemu-trivial] [PULL 23/23] Fix build for less common build directories names, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 20/23] monitor: deprecate 'default' option, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 03/23] target-lm32: fix style issue, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 15/23] scripts/hxtool: fix undefined behavour of echo, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 18/23] Makefile: Fix help text for target 'installer', Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 14/23] qemu-options.hx: set: fix copy-paste error, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 16/23] migration: Remove unneeded NULL check from migrate_fd_error(), Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 21/23] scripts/clean-includes: added duplicate #include check, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 10/23] milkymist-pfpu: fix potential integer overflow, Michael Tokarev, 2016/10/28
- [Qemu-trivial] [PULL 09/23] hw/block/nvme: Simplify if-statements a little bit, Michael Tokarev, 2016/10/28