Re: [Qemu-devel] Qemu arm emulation

[Ulrich Hecht <uli@suse.de>]

[-- Attachment #1: Type: text/plain, Size: 483 bytes --]

Hi!

On Friday 04 February 2005 15:19, Paul Brook wrote:
> On Friday 04 February 2005 12:30, Ulrich Hecht wrote:
> > +void OPPROTO op_movl_T1_im_cc(void)
> > +{
> > +    T1 = PARAM1;
> > +    env->CF = PARAM1 >> 31;
> > +}
>
> This should be "((uint32_t) PARAM1) >> 31".
> The comments say CF is 0 or 1. PARAM1 is signed, so your code will
> result in 0 or -1 on 32-bit hosts.
>
> >              /* XXX: is CF modified ? */
>
> Probably want to remove this comment now.

OK.

CU
Uli

[-- Attachment #2: qemu-shifter_carry.patch --]
[-- Type: text/x-diff, Size: 1241 bytes --]

Index: target-arm/op.c
===================================================================
RCS file: /cvsroot/qemu/qemu/target-arm/op.c,v
retrieving revision 1.7
diff -u -r1.7 op.c
--- target-arm/op.c	2 Feb 2005 20:43:01 -0000	1.7
+++ target-arm/op.c	4 Feb 2005 14:24:39 -0000
@@ -105,6 +105,12 @@
     T1 = PARAM1;
 }
 
+void OPPROTO op_movl_T1_im_cc(void)
+{
+    T1 = PARAM1;
+    env->CF = ((uint32_t)PARAM1) >> 31;
+}
+
 void OPPROTO op_movl_T2_im(void)
 {
     T2 = PARAM1;
Index: target-arm/translate.c
===================================================================
RCS file: /cvsroot/qemu/qemu/target-arm/translate.c,v
retrieving revision 1.15
diff -u -r1.15 translate.c
--- target-arm/translate.c	31 Jan 2005 20:43:28 -0000	1.15
+++ target-arm/translate.c	4 Feb 2005 14:24:39 -0000
@@ -535,8 +535,10 @@
             shift = ((insn >> 8) & 0xf) * 2;
             if (shift)
                 val = (val >> shift) | (val << (32 - shift));
-            gen_op_movl_T1_im(val);
-            /* XXX: is CF modified ? */
+            if (logic_cc && shift)
+              gen_op_movl_T1_im_cc(val);
+            else
+              gen_op_movl_T1_im(val);
         } else {
             /* register */
             rm = (insn) & 0xf;