From: Aurelien Jarno <aurelien@aurel32.net>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [5355] target-alpha: misc fixes
Date: Mon, 29 Sep 2008 17:21:37 +0000 [thread overview]
Message-ID: <E1KkMRF-0001wJ-NQ@cvs.savannah.gnu.org> (raw)
Revision: 5355
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5355
Author: aurel32
Date: 2008-09-29 17:21:37 +0000 (Mon, 29 Sep 2008)
Log Message:
-----------
target-alpha: misc fixes
Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
Modified Paths:
--------------
trunk/target-alpha/op.c
trunk/target-alpha/op_helper.h
trunk/target-alpha/translate.c
Modified: trunk/target-alpha/op.c
===================================================================
--- trunk/target-alpha/op.c 2008-09-29 17:21:28 UTC (rev 5354)
+++ trunk/target-alpha/op.c 2008-09-29 17:21:37 UTC (rev 5355)
@@ -25,15 +25,6 @@
#include "host-utils.h"
#include "op_helper.h"
-/* Debug stuff */
-void OPPROTO op_no_op (void)
-{
-#if !defined (DEBUG_OP)
- __asm__ __volatile__("nop" : : : "memory");
-#endif
- RETURN();
-}
-
/* Load and stores */
#define MEMSUFFIX _raw
#include "op_mem.h"
Modified: trunk/target-alpha/op_helper.h
===================================================================
--- trunk/target-alpha/op_helper.h 2008-09-29 17:21:28 UTC (rev 5354)
+++ trunk/target-alpha/op_helper.h 2008-09-29 17:21:37 UTC (rev 5355)
@@ -43,5 +43,4 @@
void helper_mtpr (int iprn);
void helper_ld_phys_to_virt (void);
void helper_st_phys_to_virt (void);
-void helper_tb_flush (void);
Modified: trunk/target-alpha/translate.c
===================================================================
--- trunk/target-alpha/translate.c 2008-09-29 17:21:28 UTC (rev 5354)
+++ trunk/target-alpha/translate.c 2008-09-29 17:21:37 UTC (rev 5355)
@@ -31,7 +31,6 @@
#include "qemu-common.h"
#define DO_SINGLE_STEP
-#define GENERATE_NOP
#define ALPHA_DEBUG_DISAS
#define DO_TB_FLUSH
@@ -104,13 +103,6 @@
done_init = 1;
}
-static always_inline void gen_op_nop (void)
-{
-#if defined(GENERATE_NOP)
- gen_op_no_op();
-#endif
-}
-
/* Memory moves */
#if defined(CONFIG_USER_ONLY)
#define OP_LD_TABLE(width) \
@@ -184,10 +176,7 @@
int ra, int rb, int32_t disp16,
int clear)
{
- if (ra == 31 && disp16 == 0) {
- /* UNOP */
- gen_op_nop();
- } else {
+ if (ra != 31 || disp16 != 0) {
if (rb != 31)
tcg_gen_addi_i64(cpu_T[0], cpu_ir[rb], disp16);
else
@@ -374,8 +363,7 @@
gen_set_label(l2);
}
-static always_inline void gen_cmov (DisasContext *ctx,
- TCGCond inv_cond,
+static always_inline void gen_cmov (TCGCond inv_cond,
int ra, int rb, int rc,
int islit, uint8_t lit, int mask)
{
@@ -487,7 +475,7 @@
tcg_gen_shli_i64(cpu_ir[rc], cpu_ir[ra], 64 - ((lit & 7) * 8));
else
tcg_gen_mov_i64(cpu_ir[rc], cpu_ir[ra]);
- } else {
+ } else {
TCGv tmp1, tmp2;
tmp1 = tcg_temp_new(TCG_TYPE_I64);
tcg_gen_andi_i64(tmp1, cpu_ir[rb], 7);
@@ -521,7 +509,7 @@
tcg_gen_shli_i64(tmp, tmp, 3);
tcg_gen_shr_i64(cpu_ir[rc], cpu_ir[ra], tmp);
tcg_temp_free(tmp);
- }
+ }
if (tcg_gen_ext_i64)
tcg_gen_ext_i64(cpu_ir[rc], cpu_ir[rc]);
} else
@@ -529,9 +517,9 @@
}
/* Code to call arith3 helpers */
-static always_inline void gen_arith3_helper(void *helper,
- int ra, int rb, int rc,
- int islit, uint8_t lit)
+static always_inline void gen_arith3 (void *helper,
+ int ra, int rb, int rc,
+ int islit, uint8_t lit)
{
if (unlikely(rc == 31))
return;
@@ -792,7 +780,7 @@
break;
case 0x0F:
/* CMPBGE */
- gen_arith3_helper(helper_cmpbge, ra, rb, rc, islit, lit);
+ gen_arith3(helper_cmpbge, ra, rb, rc, islit, lit);
break;
case 0x12:
/* S8ADDL */
@@ -958,11 +946,11 @@
break;
case 0x40:
/* ADDL/V */
- gen_arith3_helper(helper_addlv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_addlv, ra, rb, rc, islit, lit);
break;
case 0x49:
/* SUBL/V */
- gen_arith3_helper(helper_sublv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_sublv, ra, rb, rc, islit, lit);
break;
case 0x4D:
/* CMPLT */
@@ -970,11 +958,11 @@
break;
case 0x60:
/* ADDQ/V */
- gen_arith3_helper(helper_addqv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_addqv, ra, rb, rc, islit, lit);
break;
case 0x69:
/* SUBQ/V */
- gen_arith3_helper(helper_subqv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_subqv, ra, rb, rc, islit, lit);
break;
case 0x6D:
/* CMPLE */
@@ -1015,11 +1003,11 @@
break;
case 0x14:
/* CMOVLBS */
- gen_cmov(ctx, TCG_COND_EQ, ra, rb, rc, islit, lit, 1);
+ gen_cmov(TCG_COND_EQ, ra, rb, rc, islit, lit, 1);
break;
case 0x16:
/* CMOVLBC */
- gen_cmov(ctx, TCG_COND_NE, ra, rb, rc, islit, lit, 1);
+ gen_cmov(TCG_COND_NE, ra, rb, rc, islit, lit, 1);
break;
case 0x20:
/* BIS */
@@ -1027,7 +1015,7 @@
if (ra != 31) {
if (islit)
tcg_gen_ori_i64(cpu_ir[rc], cpu_ir[ra], lit);
- else
+ else
tcg_gen_or_i64(cpu_ir[rc], cpu_ir[ra], cpu_ir[rb]);
} else {
if (islit)
@@ -1039,11 +1027,11 @@
break;
case 0x24:
/* CMOVEQ */
- gen_cmov(ctx, TCG_COND_NE, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_NE, ra, rb, rc, islit, lit, 0);
break;
case 0x26:
/* CMOVNE */
- gen_cmov(ctx, TCG_COND_EQ, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_EQ, ra, rb, rc, islit, lit, 0);
break;
case 0x28:
/* ORNOT */
@@ -1083,11 +1071,11 @@
break;
case 0x44:
/* CMOVLT */
- gen_cmov(ctx, TCG_COND_GE, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_GE, ra, rb, rc, islit, lit, 0);
break;
case 0x46:
/* CMOVGE */
- gen_cmov(ctx, TCG_COND_LT, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_LT, ra, rb, rc, islit, lit, 0);
break;
case 0x48:
/* EQV */
@@ -1120,11 +1108,11 @@
break;
case 0x64:
/* CMOVLE */
- gen_cmov(ctx, TCG_COND_GT, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_GT, ra, rb, rc, islit, lit, 0);
break;
case 0x66:
/* CMOVGT */
- gen_cmov(ctx, TCG_COND_LE, ra, rb, rc, islit, lit, 0);
+ gen_cmov(TCG_COND_LE, ra, rb, rc, islit, lit, 0);
break;
case 0x6C:
/* IMPLVER */
@@ -1139,7 +1127,7 @@
switch (fn7) {
case 0x02:
/* MSKBL */
- gen_arith3_helper(helper_mskbl, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskbl, ra, rb, rc, islit, lit);
break;
case 0x06:
/* EXTBL */
@@ -1147,11 +1135,11 @@
break;
case 0x0B:
/* INSBL */
- gen_arith3_helper(helper_insbl, ra, rb, rc, islit, lit);
+ gen_arith3(helper_insbl, ra, rb, rc, islit, lit);
break;
case 0x12:
/* MSKWL */
- gen_arith3_helper(helper_mskwl, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskwl, ra, rb, rc, islit, lit);
break;
case 0x16:
/* EXTWL */
@@ -1159,11 +1147,11 @@
break;
case 0x1B:
/* INSWL */
- gen_arith3_helper(helper_inswl, ra, rb, rc, islit, lit);
+ gen_arith3(helper_inswl, ra, rb, rc, islit, lit);
break;
case 0x22:
/* MSKLL */
- gen_arith3_helper(helper_mskll, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskll, ra, rb, rc, islit, lit);
break;
case 0x26:
/* EXTLL */
@@ -1171,19 +1159,19 @@
break;
case 0x2B:
/* INSLL */
- gen_arith3_helper(helper_insll, ra, rb, rc, islit, lit);
+ gen_arith3(helper_insll, ra, rb, rc, islit, lit);
break;
case 0x30:
/* ZAP */
- gen_arith3_helper(helper_zap, ra, rb, rc, islit, lit);
+ gen_arith3(helper_zap, ra, rb, rc, islit, lit);
break;
case 0x31:
/* ZAPNOT */
- gen_arith3_helper(helper_zapnot, ra, rb, rc, islit, lit);
+ gen_arith3(helper_zapnot, ra, rb, rc, islit, lit);
break;
case 0x32:
/* MSKQL */
- gen_arith3_helper(helper_mskql, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskql, ra, rb, rc, islit, lit);
break;
case 0x34:
/* SRL */
@@ -1223,7 +1211,7 @@
break;
case 0x3B:
/* INSQL */
- gen_arith3_helper(helper_insql, ra, rb, rc, islit, lit);
+ gen_arith3(helper_insql, ra, rb, rc, islit, lit);
break;
case 0x3C:
/* SRA */
@@ -1243,11 +1231,11 @@
break;
case 0x52:
/* MSKWH */
- gen_arith3_helper(helper_mskwh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskwh, ra, rb, rc, islit, lit);
break;
case 0x57:
/* INSWH */
- gen_arith3_helper(helper_inswh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_inswh, ra, rb, rc, islit, lit);
break;
case 0x5A:
/* EXTWH */
@@ -1255,11 +1243,11 @@
break;
case 0x62:
/* MSKLH */
- gen_arith3_helper(helper_msklh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_msklh, ra, rb, rc, islit, lit);
break;
case 0x67:
/* INSLH */
- gen_arith3_helper(helper_inslh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_inslh, ra, rb, rc, islit, lit);
break;
case 0x6A:
/* EXTLH */
@@ -1267,11 +1255,11 @@
break;
case 0x72:
/* MSKQH */
- gen_arith3_helper(helper_mskqh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mskqh, ra, rb, rc, islit, lit);
break;
case 0x77:
/* INSQH */
- gen_arith3_helper(helper_insqh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_insqh, ra, rb, rc, islit, lit);
break;
case 0x7A:
/* EXTQH */
@@ -1310,15 +1298,15 @@
break;
case 0x30:
/* UMULH */
- gen_arith3_helper(helper_umulh, ra, rb, rc, islit, lit);
+ gen_arith3(helper_umulh, ra, rb, rc, islit, lit);
break;
case 0x40:
/* MULL/V */
- gen_arith3_helper(helper_mullv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mullv, ra, rb, rc, islit, lit);
break;
case 0x60:
/* MULQ/V */
- gen_arith3_helper(helper_mulqv, ra, rb, rc, islit, lit);
+ gen_arith3(helper_mulqv, ra, rb, rc, islit, lit);
break;
default:
goto invalid_opc;
@@ -2397,7 +2385,7 @@
}
if (loglevel & CPU_LOG_TB_IN_ASM) {
fprintf(logfile, "IN: %s\n", lookup_symbol(pc_start));
- target_disas(logfile, pc_start, ctx.pc - pc_start, 1);
+ target_disas(logfile, pc_start, ctx.pc - pc_start, 1);
fprintf(logfile, "\n");
}
#endif
reply other threads:[~2008-09-29 17:21 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=E1KkMRF-0001wJ-NQ@cvs.savannah.gnu.org \
--to=aurelien@aurel32.net \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).