* [Qemu-devel] [5380] target-ppc: fix computation of XER.{CA, OV} in addme, subfme
@ 2008-10-01 21:45 Aurelien Jarno
2008-10-02 0:14 ` [Qemu-devel] target-ppc: does not compile anymore Martin Mohring
0 siblings, 1 reply; 5+ messages in thread
From: Aurelien Jarno @ 2008-10-01 21:45 UTC (permalink / raw)
To: qemu-devel
Revision: 5380
http://svn.sv.gnu.org/viewvc/?view=rev&root=qemu&revision=5380
Author: aurel32
Date: 2008-10-01 21:45:37 +0000 (Wed, 01 Oct 2008)
Log Message:
-----------
target-ppc: fix computation of XER.{CA, OV} in addme, subfme
(Jocelyn Mayer)
Modified Paths:
--------------
trunk/target-ppc/op.c
trunk/target-ppc/op_helper.c
Modified: trunk/target-ppc/op.c
===================================================================
--- trunk/target-ppc/op.c 2008-10-01 21:45:18 UTC (rev 5379)
+++ trunk/target-ppc/op.c 2008-10-01 21:45:37 UTC (rev 5380)
@@ -640,8 +640,6 @@
T0 += xer_ca + (-1);
if (likely((uint32_t)T1 != 0))
xer_ca = 1;
- else
- xer_ca = 0;
RETURN();
}
@@ -651,8 +649,6 @@
T0 += xer_ca + (-1);
if (likely((uint64_t)T1 != 0))
xer_ca = 1;
- else
- xer_ca = 0;
RETURN();
}
#endif
@@ -930,8 +926,6 @@
T0 = ~T0 + xer_ca - 1;
if (likely((uint32_t)T0 != UINT32_MAX))
xer_ca = 1;
- else
- xer_ca = 0;
RETURN();
}
@@ -941,8 +935,6 @@
T0 = ~T0 + xer_ca - 1;
if (likely((uint64_t)T0 != UINT64_MAX))
xer_ca = 1;
- else
- xer_ca = 0;
RETURN();
}
#endif
Modified: trunk/target-ppc/op_helper.c
===================================================================
--- trunk/target-ppc/op_helper.c 2008-10-01 21:45:18 UTC (rev 5379)
+++ trunk/target-ppc/op_helper.c 2008-10-01 21:45:37 UTC (rev 5380)
@@ -151,10 +151,8 @@
T0 += xer_ca + (-1);
xer_ov = ((uint32_t)T1 & ((uint32_t)T1 ^ (uint32_t)T0)) >> 31;
xer_so |= xer_ov;
- if (likely(T1 != 0))
+ if (likely((uint32_t)T1 != 0))
xer_ca = 1;
- else
- xer_ca = 0;
}
#if defined(TARGET_PPC64)
@@ -164,10 +162,8 @@
T0 += xer_ca + (-1);
xer_ov = ((uint64_t)T1 & ((uint64_t)T1 ^ (uint64_t)T0)) >> 63;
xer_so |= xer_ov;
- if (likely(T1 != 0))
+ if (likely((uint64_t)T1 != 0))
xer_ca = 1;
- else
- xer_ca = 0;
}
#endif
@@ -312,8 +308,6 @@
xer_so |= xer_ov;
if (likely((uint32_t)T1 != UINT32_MAX))
xer_ca = 1;
- else
- xer_ca = 0;
}
#if defined(TARGET_PPC64)
@@ -325,8 +319,6 @@
xer_so |= xer_ov;
if (likely((uint64_t)T1 != UINT64_MAX))
xer_ca = 1;
- else
- xer_ca = 0;
}
#endif
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] target-ppc: does not compile anymore
2008-10-01 21:45 [Qemu-devel] [5380] target-ppc: fix computation of XER.{CA, OV} in addme, subfme Aurelien Jarno
@ 2008-10-02 0:14 ` Martin Mohring
2008-10-02 11:42 ` Martin Mohring
0 siblings, 1 reply; 5+ messages in thread
From: Martin Mohring @ 2008-10-02 0:14 UTC (permalink / raw)
To: qemu-devel
not sure, which change it was. But now I get both on x86_64 or i586
host, opensuse 11.0, a compile error:
gcc -O2 -g -fno-strict-aliasing -Wall -Wundef -Wendif-labels
-Wwrite-strings -fno-reorder-blocks -fno-gcse -fno-tree-ch
-fno-optimize-sibling-calls -fno-crossjumping -fno-align-labels
-fno-align-jumps -fno-align-functions -fno-section-anchors
-mpreferred-stack-boundary=2 -fomit-frame-pointer -m32 -I. -I..
-I/usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc
-I/usr/src/packages/BUILD/qemu-0.9.2svn5391 -MMD -MT op.o -MP
-DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
-I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg
-I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg/i386
-I/usr/src/packages/BUILD/qemu-0.9.2svn5391/fpu -DHAS_AUDIO
-DHAS_AUDIO_CHOICE -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/slirp -c
-o op.o /usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc/op.c
../dyngen -c -o dyngen-opc.h op.o
dyngen: ret or jmp expected at the end of op_divw
make[1]: *** [dyngen-opc.h] Error 1
make[1]: Leaving directory
`/usr/src/packages/BUILD/qemu-0.9.2svn5391/ppc-softmmu'
make: *** [subdir-ppc-softmmu] Error 2
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] target-ppc: does not compile anymore
2008-10-02 0:14 ` [Qemu-devel] target-ppc: does not compile anymore Martin Mohring
@ 2008-10-02 11:42 ` Martin Mohring
2008-10-02 13:47 ` Aurelien Jarno
0 siblings, 1 reply; 5+ messages in thread
From: Martin Mohring @ 2008-10-02 11:42 UTC (permalink / raw)
To: qemu-devel
Martin Mohring wrote:
> not sure, which change it was. But now I get both on x86_64 or i586
> host, opensuse 11.0, a compile error:
>
> gcc -O2 -g -fno-strict-aliasing -Wall -Wundef -Wendif-labels
> -Wwrite-strings -fno-reorder-blocks -fno-gcse -fno-tree-ch
> -fno-optimize-sibling-calls -fno-crossjumping -fno-align-labels
> -fno-align-jumps -fno-align-functions -fno-section-anchors
> -mpreferred-stack-boundary=2 -fomit-frame-pointer -m32 -I. -I..
> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc
> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391 -MMD -MT op.o -MP
> -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg
> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg/i386
> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/fpu -DHAS_AUDIO
> -DHAS_AUDIO_CHOICE -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/slirp -c
> -o op.o /usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc/op.c
> ../dyngen -c -o dyngen-opc.h op.o
> dyngen: ret or jmp expected at the end of op_divw
> make[1]: *** [dyngen-opc.h] Error 1
> make[1]: Leaving directory
> `/usr/src/packages/BUILD/qemu-0.9.2svn5391/ppc-softmmu'
> make: *** [subdir-ppc-softmmu] Error 2
>
>
Some additional Information that you might need (for opensuse 11.0)
- gcc is version 4.3.1
- kernel headers is version 2.6.25
- glibc is based on version 2.8
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] target-ppc: does not compile anymore
2008-10-02 11:42 ` Martin Mohring
@ 2008-10-02 13:47 ` Aurelien Jarno
2008-10-02 21:36 ` Martin Mohring
0 siblings, 1 reply; 5+ messages in thread
From: Aurelien Jarno @ 2008-10-02 13:47 UTC (permalink / raw)
To: qemu-devel
Martin Mohring a écrit :
> Martin Mohring wrote:
>> not sure, which change it was. But now I get both on x86_64 or i586
>> host, opensuse 11.0, a compile error:
>>
>> gcc -O2 -g -fno-strict-aliasing -Wall -Wundef -Wendif-labels
>> -Wwrite-strings -fno-reorder-blocks -fno-gcse -fno-tree-ch
>> -fno-optimize-sibling-calls -fno-crossjumping -fno-align-labels
>> -fno-align-jumps -fno-align-functions -fno-section-anchors
>> -mpreferred-stack-boundary=2 -fomit-frame-pointer -m32 -I. -I..
>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc
>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391 -MMD -MT op.o -MP
>> -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg
>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg/i386
>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/fpu -DHAS_AUDIO
>> -DHAS_AUDIO_CHOICE -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/slirp -c
>> -o op.o /usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc/op.c
>> ../dyngen -c -o dyngen-opc.h op.o
>> dyngen: ret or jmp expected at the end of op_divw
>> make[1]: *** [dyngen-opc.h] Error 1
>> make[1]: Leaving directory
>> `/usr/src/packages/BUILD/qemu-0.9.2svn5391/ppc-softmmu'
>> make: *** [subdir-ppc-softmmu] Error 2
>>
>>
> Some additional Information that you might need (for opensuse 11.0)
> - gcc is version 4.3.1
You need gcc 3.4 to compile the ppc target which still use dyngen.
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@debian.org | aurelien@aurel32.net
`- people.debian.org/~aurel32 | www.aurel32.net
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [Qemu-devel] target-ppc: does not compile anymore
2008-10-02 13:47 ` Aurelien Jarno
@ 2008-10-02 21:36 ` Martin Mohring
0 siblings, 0 replies; 5+ messages in thread
From: Martin Mohring @ 2008-10-02 21:36 UTC (permalink / raw)
To: qemu-devel
Aurelien Jarno wrote:
> Martin Mohring a écrit :
>
>> Martin Mohring wrote:
>>
>>> not sure, which change it was. But now I get both on x86_64 or i586
>>> host, opensuse 11.0, a compile error:
>>>
>>> gcc -O2 -g -fno-strict-aliasing -Wall -Wundef -Wendif-labels
>>> -Wwrite-strings -fno-reorder-blocks -fno-gcse -fno-tree-ch
>>> -fno-optimize-sibling-calls -fno-crossjumping -fno-align-labels
>>> -fno-align-jumps -fno-align-functions -fno-section-anchors
>>> -mpreferred-stack-boundary=2 -fomit-frame-pointer -m32 -I. -I..
>>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc
>>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391 -MMD -MT op.o -MP
>>> -DNEED_CPU_H -D_GNU_SOURCE -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE
>>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg
>>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/tcg/i386
>>> -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/fpu -DHAS_AUDIO
>>> -DHAS_AUDIO_CHOICE -I/usr/src/packages/BUILD/qemu-0.9.2svn5391/slirp -c
>>> -o op.o /usr/src/packages/BUILD/qemu-0.9.2svn5391/target-ppc/op.c
>>> ../dyngen -c -o dyngen-opc.h op.o
>>> dyngen: ret or jmp expected at the end of op_divw
>>> make[1]: *** [dyngen-opc.h] Error 1
>>> make[1]: Leaving directory
>>> `/usr/src/packages/BUILD/qemu-0.9.2svn5391/ppc-softmmu'
>>> make: *** [subdir-ppc-softmmu] Error 2
>>>
>>>
>>>
>> Some additional Information that you might need (for opensuse 11.0)
>> - gcc is version 4.3.1
>>
>
> You need gcc 3.4 to compile the ppc target which still use dyngen.
>
>
>
You are right.
I suppress from my mind from time to time that ppc still does not use tcg.
You remind me why I still keep a copy of the old 3.x gcc compiler to
build the ppc qemu user mode.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2008-10-02 21:36 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2008-10-01 21:45 [Qemu-devel] [5380] target-ppc: fix computation of XER.{CA, OV} in addme, subfme Aurelien Jarno
2008-10-02 0:14 ` [Qemu-devel] target-ppc: does not compile anymore Martin Mohring
2008-10-02 11:42 ` Martin Mohring
2008-10-02 13:47 ` Aurelien Jarno
2008-10-02 21:36 ` Martin Mohring
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).