Patch

diff --git a/target-openrisc/Makefile.objs b/target-openrisc/Makefile.objsindex 74c4b8d..52d0158 100644--- a/target-openrisc/Makefile.objs+++ b/target-openrisc/Makefile.objs@@ -1,3 +1,3 @@
obj-$(CONFIG_SOFTMMU) += machine.o
-obj-y += cpu.o interrupt.o mmu.o translate.o-obj-y += interrupt_helper.o mmu_helper.o+obj-y += cpu.o exception.o interrupt.o mmu.o translate.o+obj-y += exception_helper.o interrupt_helper.o mmu_helper.odiff --git a/target-openrisc/exception.c b/target-openrisc/exception.c
new file mode 100644
index 0000000..58e53c6--- /dev/null+++ b/target-openrisc/exception.c@@ -0,0 +1,27 @@+/*+ * OpenRISC exception.+ *+ * Copyright (c) 2011-2012 Jia Liu <proljc@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 "cpu.h"+#include "exception.h"++void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp)+{+ cpu->env.exception_index = excp;+ cpu_loop_exit(&cpu->env);+}diff --git a/target-openrisc/exception.h b/target-openrisc/exception.h
new file mode 100644
index 0000000..4b64430--- /dev/null+++ b/target-openrisc/exception.h@@ -0,0 +1,28 @@+/*+ * OpenRISC exception header.+ *+ * Copyright (c) 2011-2012 Jia Liu <proljc@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/>.+ */++#ifndef QEMU_OPENRISC_EXCP_H+#define QEMU_OPENRISC_EXCP_H++#include "cpu.h"+#include "qemu-common.h"++void QEMU_NORETURN raise_exception(OpenRISCCPU *cpu, uint32_t excp);++#endif /* QEMU_OPENRISC_EXCP_H */diff --git a/target-openrisc/exception_helper.c b/target-openrisc/exception_helper.c
new file mode 100644
index 0000000..dab4148--- /dev/null+++ b/target-openrisc/exception_helper.c@@ -0,0 +1,29 @@+/*+ * OpenRISC exception helper routines+ *+ * Copyright (c) 2011-2012 Jia Liu <proljc@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 "cpu.h"+#include "helper.h"+#include "exception.h"++void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp)+{+ OpenRISCCPU *cpu = OPENRISC_CPU(ENV_GET_CPU(env));++ raise_exception(cpu, excp);+}diff --git a/target-openrisc/helper.h b/target-openrisc/helper.hindex 7ced5ea..43b23ca 100644--- a/target-openrisc/helper.h+++ b/target-openrisc/helper.h@@ -19,6 +19,9 @@
#include "def-helper.h"
+/* exception */+DEF_HELPER_FLAGS_2(exception, 0, void, env, i32)+
/* interrupt */
DEF_HELPER_FLAGS_1(rfe, 0, void, env)