Commit 9b68a775 authored by Peter Crosthwaite's avatar Peter Crosthwaite Committed by Paolo Bonzini
Browse files

translate-all: Move tcg_handle_interrupt() to -common 



Move this function to common code. It has no arch specific
dependencies. Prepares support for multi-arch where the translate-all
interface needs to be virtualised. One less thing to virtualise.

Reviewed-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarPeter Crosthwaite <crosthwaite.peter@gmail.com>
Message-Id: <44a7c73604ed2552af47ed02b047b6a772b683e0.1441614289.git.crosthwaite.peter@gmail.com>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 5abf9495

Makefile.target

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ all: $(PROGS) stap 
#########################################################

# cpu emulator library

obj-y = exec.o translate-all.o cpu-exec.o

obj-y += translate-common.o

obj-y += cpu-exec-common.o

obj-y += tcg/tcg.o tcg/tcg-op.o tcg/optimize.o

obj-$(CONFIG_TCG_INTERPRETER) += tci.o

translate-all.c

+0 −30
Original line number Diff line number Diff line
@@ -1491,36 +1491,6 @@ void tb_check_watchpoint(CPUState *cpu) 
}



#ifndef CONFIG_USER_ONLY

/* mask must never be zero, except for A20 change call */

static void tcg_handle_interrupt(CPUState *cpu, int mask)

{

    int old_mask;



    old_mask = cpu->interrupt_request;

    cpu->interrupt_request |= mask;



    /*

     * If called from iothread context, wake the target cpu in

     * case its halted.

     */

    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

        return;

    }



    if (use_icount) {

        cpu->icount_decr.u16.high = 0xffff;

        if (!cpu->can_do_io

            && (mask & ~old_mask) != 0) {

            cpu_abort(cpu, "Raised interrupt while not in I/O function");

        }

    } else {

        cpu->tcg_exit_req = 1;

    }

}



CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;



/* in deterministic execution mode, instructions doing device I/Os

   must be at the end of the TB */

void cpu_io_recompile(CPUState *cpu, uintptr_t retaddr)

translate-common.c

0 → 100644
+53 −0
Original line number Diff line number Diff line 
/*

 *  Host code generation common components

 *

 *  Copyright (c) 2015 Peter Crosthwaite <crosthwaite.peter@gmail.com>

 *

 * This library is free software; you can redistribute it and/or

 * modify it under the terms of the GNU Lesser General Public

 * License as published by the Free Software Foundation; either

 * version 2 of the License, or (at your option) any later version.

 *

 * This library is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU

 * Lesser General Public License for more details.

 *

 * You should have received a copy of the GNU Lesser General Public

 * License along with this library; if not, see <http://www.gnu.org/licenses/>.

 */



#include "qemu-common.h"

#include "qom/cpu.h"



#ifndef CONFIG_USER_ONLY

/* mask must never be zero, except for A20 change call */

static void tcg_handle_interrupt(CPUState *cpu, int mask)

{

    int old_mask;



    old_mask = cpu->interrupt_request;

    cpu->interrupt_request |= mask;



    /*

     * If called from iothread context, wake the target cpu in

     * case its halted.

     */

    if (!qemu_cpu_is_self(cpu)) {

        qemu_cpu_kick(cpu);

        return;

    }



    if (use_icount) {

        cpu->icount_decr.u16.high = 0xffff;

        if (!cpu->can_do_io

            && (mask & ~old_mask) != 0) {

            cpu_abort(cpu, "Raised interrupt while not in I/O function");

        }

    } else {

        cpu->tcg_exit_req = 1;

    }

}



CPUInterruptHandler cpu_interrupt_handler = tcg_handle_interrupt;

#endif