From: Blue Swirl <blauwirbel@gmail.com>
To: qemu-devel@nongnu.org
Subject: [Qemu-devel] [4466] Fix qemu_ld/st branches, constification, use orcc for tst synthetic op
Date: Sat, 17 May 2008 09:41:18 +0000 [thread overview]
Message-ID: <E1JxIuj-0001ll-U8@cvs.savannah.gnu.org> (raw)
Revision: 4466
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=4466
Author: blueswir1
Date: 2008-05-17 09:41:14 +0000 (Sat, 17 May 2008)
Log Message:
-----------
Fix qemu_ld/st branches, constification, use orcc for tst synthetic op
Modified Paths:
--------------
trunk/tcg/sparc/tcg-target.c
Modified: trunk/tcg/sparc/tcg-target.c
===================================================================
--- trunk/tcg/sparc/tcg-target.c 2008-05-17 07:38:10 UTC (rev 4465)
+++ trunk/tcg/sparc/tcg-target.c 2008-05-17 09:41:14 UTC (rev 4466)
@@ -198,8 +198,8 @@
#define ARITH_ADD (INSN_OP(2) | INSN_OP3(0x00))
#define ARITH_AND (INSN_OP(2) | INSN_OP3(0x01))
-#define ARITH_ANDCC (INSN_OP(2) | INSN_OP3(0x11))
#define ARITH_OR (INSN_OP(2) | INSN_OP3(0x02))
+#define ARITH_ORCC (INSN_OP(2) | INSN_OP3(0x12))
#define ARITH_XOR (INSN_OP(2) | INSN_OP3(0x03))
#define ARITH_SUB (INSN_OP(2) | INSN_OP3(0x04))
#define ARITH_SUBCC (INSN_OP(2) | INSN_OP3(0x14))
@@ -387,8 +387,8 @@
int label_index)
{
if (const_arg2 && arg2 == 0)
- /* andcc r, r, %g0 */
- tcg_out_arith(s, TCG_REG_G0, arg1, arg1, ARITH_ANDCC);
+ /* orcc r, r, %g0 */
+ tcg_out_arith(s, TCG_REG_G0, TCG_REG_G0, arg1, ARITH_ORCC);
else
/* subcc r1, r2, %g0 */
tcg_out_arith(s, TCG_REG_G0, arg1, arg2, ARITH_SUBCC);
@@ -418,14 +418,14 @@
extern void __stq_mmu(void);
-static void *qemu_ld_helpers[4] = {
+static const void * const qemu_ld_helpers[4] = {
__ldb_mmu,
__ldw_mmu,
__ldl_mmu,
__ldq_mmu,
};
-static void *qemu_st_helpers[4] = {
+static const void * const qemu_st_helpers[4] = {
__stb_mmu,
__stw_mmu,
__stl_mmu,
@@ -531,7 +531,7 @@
tcg_out32(s, 0);
/* label1: */
- *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
+ *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
INSN_OFF22((unsigned long)label1_ptr -
(unsigned long)s->code_ptr));
@@ -599,7 +599,7 @@
#if defined(CONFIG_SOFTMMU)
/* label2: */
- *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
+ *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
INSN_OFF22((unsigned long)label2_ptr -
(unsigned long)s->code_ptr));
#endif
@@ -703,7 +703,7 @@
tcg_out32(s, 0);
/* label1: */
- *label1_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
+ *label1_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
INSN_OFF22((unsigned long)label1_ptr -
(unsigned long)s->code_ptr));
@@ -753,7 +753,7 @@
#if defined(CONFIG_SOFTMMU)
/* label2: */
- *label2_ptr = (INSN_OP(0) | COND_A | INSN_OP2(0x2) |
+ *label2_ptr = (INSN_OP(0) | INSN_COND(COND_A, 0) | INSN_OP2(0x2) |
INSN_OFF22((unsigned long)label2_ptr -
(unsigned long)s->code_ptr));
#endif
reply other threads:[~2008-05-17 9:41 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=E1JxIuj-0001ll-U8@cvs.savannah.gnu.org \
--to=blauwirbel@gmail.com \
--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).