Re: [Qemu-devel] Qemu arm emulation

[Ulrich Hecht <uli@suse.de>]

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

Hi!

On Friday 03 December 2004 22:07, Charlie Baylis wrote:
> 2. Shifter carry out for immediates
> When an immediate value is generated the shifter carry out is set to
> bit31 of the resulting immediate if the shift value is non zero. If
> the shift value is zero, then the shifter carry out has the value of
> the C flag.
>
> Therefore, the following instructions should alter the carry flag when
> used with an immediate which has a non-zero shift.
> ANDS BICS EORS MOVS MVNS ORRS TEQS and TSTS
> (The remaining data processing instructions generate the C flag from
> the calculation performed by the instruction)

Here's a patch that fixes the testcase. I made it for 0.6.1, but it still 
applies and works for CVS.

CU
Uli

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

--- target-arm/op.c
+++ target-arm/op.c
@@ -98,6 +98,12 @@
     T1 = PARAM1;
 }
 
+void OPPROTO op_movl_T1_im_cc(void)
+{
+    T1 = PARAM1;
+    env->CF = PARAM1 >> 31;
+}
+
 void OPPROTO op_movl_T2_im(void)
 {
     T2 = PARAM1;
--- target-arm/translate.c
+++ target-arm/translate.c
@@ -350,7 +350,11 @@
             shift = ((insn >> 8) & 0xf) * 2;
             if (shift)
                 val = (val >> shift) | (val << (32 - shift));
-            gen_op_movl_T1_im(val);
+            if (logic_cc && shift)
+              gen_op_movl_T1_im_cc(val);
+            else
+              gen_op_movl_T1_im(val);
+                
             /* XXX: is CF modified ? */
         } else {
             /* register */