Commit 8dd14a9b authored by Laurent Vivier's avatar Laurent Vivier
Browse files

linux-user: move cris cpu loop to cris directory 



No code change, only move code from main.c to
cris/cpu_loop.c.

Signed-off-by: default avatarLaurent Vivier <laurent@vivier.eu>
Reviewed-by: default avatarRichard Henderson <richard.henderson@linaro.org>
Reviewed-by: default avatarPhilippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20180411185651.21351-12-laurent@vivier.eu>
parent c37dcb4f

linux-user/cris/cpu_loop.c

+89 −0
Original line number Diff line number Diff line
@@ -21,6 +21,95 @@ 
#include "qemu.h"

#include "cpu_loop-common.h"



void cpu_loop(CPUCRISState *env)

{

    CPUState *cs = CPU(cris_env_get_cpu(env));

    int trapnr, ret;

    target_siginfo_t info;

    

    while (1) {

        cpu_exec_start(cs);

        trapnr = cpu_exec(cs);

        cpu_exec_end(cs);

        process_queued_cpu_work(cs);



        switch (trapnr) {

        case 0xaa:

            {

                info.si_signo = TARGET_SIGSEGV;

                info.si_errno = 0;

                /* XXX: check env->error_code */

                info.si_code = TARGET_SEGV_MAPERR;

                info._sifields._sigfault._addr = env->pregs[PR_EDA];

                queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            }

            break;

        case EXCP_INTERRUPT:

          /* just indicate that signals should be handled asap */

          break;

        case EXCP_BREAK:

            ret = do_syscall(env, 

                             env->regs[9], 

                             env->regs[10], 

                             env->regs[11], 

                             env->regs[12], 

                             env->regs[13], 

                             env->pregs[7], 

                             env->pregs[11],

                             0, 0);

            if (ret == -TARGET_ERESTARTSYS) {

                env->pc -= 2;

            } else if (ret != -TARGET_QEMU_ESIGRETURN) {

                env->regs[10] = ret;

            }

            break;

        case EXCP_DEBUG:

            {

                int sig;



                sig = gdb_handlesig(cs, TARGET_SIGTRAP);

                if (sig)

                  {

                    info.si_signo = sig;

                    info.si_errno = 0;

                    info.si_code = TARGET_TRAP_BRKPT;

                    queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                  }

            }

            break;

        case EXCP_ATOMIC:

            cpu_exec_step_atomic(cs);

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            exit(EXIT_FAILURE);

        }

        process_pending_signals (env);

    }

}



void target_cpu_copy_regs(CPUArchState *env, struct target_pt_regs *regs)

{

    CPUState *cpu = ENV_GET_CPU(env);

    TaskState *ts = cpu->opaque;

    struct image_info *info = ts->info;



    env->regs[0] = regs->r0;

    env->regs[1] = regs->r1;

    env->regs[2] = regs->r2;

    env->regs[3] = regs->r3;

    env->regs[4] = regs->r4;

    env->regs[5] = regs->r5;

    env->regs[6] = regs->r6;

    env->regs[7] = regs->r7;

    env->regs[8] = regs->r8;

    env->regs[9] = regs->r9;

    env->regs[10] = regs->r10;

    env->regs[11] = regs->r11;

    env->regs[12] = regs->r12;

    env->regs[13] = regs->r13;

    env->regs[14] = info->start_stack;

    env->regs[15] = regs->acr;

    env->pc = regs->erp;

}

linux-user/main.c

+0 −90
Original line number Diff line number Diff line
@@ -149,76 +149,6 @@ void fork_end(int child) 
    }

}



#ifdef TARGET_CRIS

void cpu_loop(CPUCRISState *env)

{

    CPUState *cs = CPU(cris_env_get_cpu(env));

    int trapnr, ret;

    target_siginfo_t info;

    

    while (1) {

        cpu_exec_start(cs);

        trapnr = cpu_exec(cs);

        cpu_exec_end(cs);

        process_queued_cpu_work(cs);



        switch (trapnr) {

        case 0xaa:

            {

                info.si_signo = TARGET_SIGSEGV;

                info.si_errno = 0;

                /* XXX: check env->error_code */

                info.si_code = TARGET_SEGV_MAPERR;

                info._sifields._sigfault._addr = env->pregs[PR_EDA];

                queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

            }

            break;

	case EXCP_INTERRUPT:

	  /* just indicate that signals should be handled asap */

	  break;

        case EXCP_BREAK:

            ret = do_syscall(env, 

                             env->regs[9], 

                             env->regs[10], 

                             env->regs[11], 

                             env->regs[12], 

                             env->regs[13], 

                             env->pregs[7], 

                             env->pregs[11],

                             0, 0);

            if (ret == -TARGET_ERESTARTSYS) {

                env->pc -= 2;

            } else if (ret != -TARGET_QEMU_ESIGRETURN) {

                env->regs[10] = ret;

            }

            break;

        case EXCP_DEBUG:

            {

                int sig;



                sig = gdb_handlesig(cs, TARGET_SIGTRAP);

                if (sig)

                  {

                    info.si_signo = sig;

                    info.si_errno = 0;

                    info.si_code = TARGET_TRAP_BRKPT;

                    queue_signal(env, info.si_signo, QEMU_SI_FAULT, &info);

                  }

            }

            break;

        case EXCP_ATOMIC:

            cpu_exec_step_atomic(cs);

            break;

        default:

            printf ("Unhandled trap: 0x%x\n", trapnr);

            cpu_dump_state(cs, stderr, fprintf, 0);

            exit(EXIT_FAILURE);

        }

        process_pending_signals (env);

    }

}

#endif



#ifdef TARGET_MICROBLAZE

void cpu_loop(CPUMBState *env)

{
@@ -2290,26 +2220,6 @@ int main(int argc, char **argv, char **envp) 
        env->ir[IR_SP] = regs->usp;

        env->pc = regs->pc;

    }

#elif defined(TARGET_CRIS)

    {

	    env->regs[0] = regs->r0;

	    env->regs[1] = regs->r1;

	    env->regs[2] = regs->r2;

	    env->regs[3] = regs->r3;

	    env->regs[4] = regs->r4;

	    env->regs[5] = regs->r5;

	    env->regs[6] = regs->r6;

	    env->regs[7] = regs->r7;

	    env->regs[8] = regs->r8;

	    env->regs[9] = regs->r9;

	    env->regs[10] = regs->r10;

	    env->regs[11] = regs->r11;

	    env->regs[12] = regs->r12;

	    env->regs[13] = regs->r13;

	    env->regs[14] = info->start_stack;

	    env->regs[15] = regs->acr;	    

	    env->pc = regs->erp;

    }

#elif defined(TARGET_S390X)

    {

            int i;