mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-02 15:23:53 -06:00
target-*: Don't redefine cpu_exec()
This function needs to be converted to QOM hook and virtualised for multi-arch. This rename interferes, as cpu-qom will not have access to the renaming causing name divergence. This rename doesn't really do anything anyway so just delete it. Signed-off-by: Peter Crosthwaite <crosthwaite.peter@gmail.com> Message-Id: <69bd25a8678b8b31b91cd9760c777bed1aafb44e.1437212383.git.crosthwaite.peter@gmail.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Peter Crosthwaite <crosthwaitepeter@gmail.com>
This commit is contained in:
parent
be968c721e
commit
8642c1b81e
20 changed files with 18 additions and 53 deletions
|
@ -157,7 +157,7 @@ static inline void exclusive_idle(void)
|
|||
}
|
||||
|
||||
/* Start an exclusive operation.
|
||||
Must only be called from outside cpu_arm_exec. */
|
||||
Must only be called from outside cpu_exec. */
|
||||
static inline void start_exclusive(void)
|
||||
{
|
||||
CPUState *other_cpu;
|
||||
|
@ -291,7 +291,7 @@ void cpu_loop(CPUX86State *env)
|
|||
|
||||
for(;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_x86_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch(trapnr) {
|
||||
case 0x80:
|
||||
|
@ -732,7 +732,7 @@ void cpu_loop(CPUARMState *env)
|
|||
|
||||
for(;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_arm_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch(trapnr) {
|
||||
case EXCP_UDEF:
|
||||
|
@ -1068,7 +1068,7 @@ void cpu_loop(CPUARMState *env)
|
|||
|
||||
for (;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_arm_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
|
||||
switch (trapnr) {
|
||||
|
@ -1156,7 +1156,7 @@ void cpu_loop(CPUUniCore32State *env)
|
|||
|
||||
for (;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = uc32_cpu_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch (trapnr) {
|
||||
case UC32_EXCP_PRIV:
|
||||
|
@ -1361,7 +1361,7 @@ void cpu_loop (CPUSPARCState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_sparc_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
|
||||
/* Compute PSR before exposing state. */
|
||||
|
@ -1633,7 +1633,7 @@ void cpu_loop(CPUPPCState *env)
|
|||
|
||||
for(;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_ppc_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch(trapnr) {
|
||||
case POWERPC_EXCP_NONE:
|
||||
|
@ -2490,7 +2490,7 @@ void cpu_loop(CPUMIPSState *env)
|
|||
|
||||
for(;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_mips_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch(trapnr) {
|
||||
case EXCP_SYSCALL:
|
||||
|
@ -2730,7 +2730,7 @@ void cpu_loop(CPUOpenRISCState *env)
|
|||
|
||||
for (;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_openrisc_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
gdbsig = 0;
|
||||
|
||||
|
@ -2824,7 +2824,7 @@ void cpu_loop(CPUSH4State *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_sh4_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
|
||||
switch (trapnr) {
|
||||
|
@ -2890,7 +2890,7 @@ void cpu_loop(CPUCRISState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_cris_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch (trapnr) {
|
||||
case 0xaa:
|
||||
|
@ -2955,7 +2955,7 @@ void cpu_loop(CPUMBState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_mb_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch (trapnr) {
|
||||
case 0xaa:
|
||||
|
@ -3072,7 +3072,7 @@ void cpu_loop(CPUM68KState *env)
|
|||
|
||||
for(;;) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_m68k_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch(trapnr) {
|
||||
case EXCP_ILLEGAL:
|
||||
|
@ -3215,7 +3215,7 @@ void cpu_loop(CPUAlphaState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_alpha_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
|
||||
/* All of the traps imply a transition through PALcode, which
|
||||
|
@ -3407,7 +3407,7 @@ void cpu_loop(CPUS390XState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_s390x_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch (trapnr) {
|
||||
case EXCP_INTERRUPT:
|
||||
|
@ -3716,7 +3716,7 @@ void cpu_loop(CPUTLGState *env)
|
|||
|
||||
while (1) {
|
||||
cpu_exec_start(cs);
|
||||
trapnr = cpu_tilegx_exec(cs);
|
||||
trapnr = cpu_exec(cs);
|
||||
cpu_exec_end(cs);
|
||||
switch (trapnr) {
|
||||
case TILEGX_EXCP_SYSCALL:
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue