From patchwork Mon Jun 11 06:31:53 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jia Liu X-Patchwork-Id: 164088 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 63373B7018 for ; Mon, 11 Jun 2012 17:28:18 +1000 (EST) Received: from localhost ([::1]:52006 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SdyBf-0001qq-9F for incoming@patchwork.ozlabs.org; Mon, 11 Jun 2012 02:33:15 -0400 Received: from eggs.gnu.org ([208.118.235.92]:48040) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SdyBK-0001Jj-1M for qemu-devel@nongnu.org; Mon, 11 Jun 2012 02:32:55 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1SdyBH-0006hg-N2 for qemu-devel@nongnu.org; Mon, 11 Jun 2012 02:32:53 -0400 Received: from mail-pz0-f45.google.com ([209.85.210.45]:39854) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1SdyBH-0006dM-EI for qemu-devel@nongnu.org; Mon, 11 Jun 2012 02:32:51 -0400 Received: by mail-pz0-f45.google.com with SMTP id v2so5483586dad.4 for ; Sun, 10 Jun 2012 23:32:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:subject:date:message-id:x-mailer:in-reply-to:references :content-type; bh=I3ozXgrc3Opj78v+uXw30YNLzLON3OQOpxuCOqgTH84=; b=ZuxW49oXQ9pZ54FGtBJFr00mgGTHqLg0qC9s6Xt/AXLQ9NIiUfr0SDJFklfrIW/tYB 1aZsLbxWWMfceGuNmPoCEHiFwwxmIjyDsTc2LrN7/ea/s3MJA5bVMlmlAGOXiCpIyfPU bKhya5J4Ljyrygguq3MgBljXbRukoNewgFERWCjXdxWLzNA4FuYyXyuE0cJAN6FeURC2 NIN+9oMAh2JwwDq/pNtIbrx1vRcfVJPqKIC07sq6SVMarvd9qdoWIpbJI6Ur+L6Y38Cj 5TDTCWFm1HonJCiH2wcXS2y1dBIXwbE7IZEfF4Sk5J/j3QonhVEiTYyjAjqezeqDTSnr AN6A== Received: by 10.68.191.106 with SMTP id gx10mr22452599pbc.37.1339396370095; Sun, 10 Jun 2012 23:32:50 -0700 (PDT) Received: from localhost ([1.202.183.51]) by mx.google.com with ESMTPS id wk3sm17410188pbc.21.2012.06.10.23.32.44 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 10 Jun 2012 23:32:47 -0700 (PDT) From: Jia Liu To: qemu-devel@nongnu.org Date: Mon, 11 Jun 2012 14:31:53 +0800 Message-Id: <1339396324-21368-6-git-send-email-proljc@gmail.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1339396324-21368-1-git-send-email-proljc@gmail.com> References: <1339396324-21368-1-git-send-email-proljc@gmail.com> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 209.85.210.45 Subject: [Qemu-devel] [PATCH v4 05/16] target-or32: Add exception support X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Add OpenRISC exception support. Signed-off-by: Jia Liu --- target-openrisc/Makefile.objs | 4 ++-- target-openrisc/excp.c | 27 +++++++++++++++++++++++++++ target-openrisc/excp.h | 28 ++++++++++++++++++++++++++++ target-openrisc/excp_helper.c | 27 +++++++++++++++++++++++++++ target-openrisc/helper.h | 3 +++ 5 files changed, 87 insertions(+), 2 deletions(-) create mode 100644 target-openrisc/excp.c create mode 100644 target-openrisc/excp.h create mode 100644 target-openrisc/excp_helper.c diff --git a/target-openrisc/Makefile.objs b/target-openrisc/Makefile.objs index 65f9391..382190a 100644 --- a/target-openrisc/Makefile.objs +++ b/target-openrisc/Makefile.objs @@ -1,3 +1,3 @@ obj-$(CONFIG_SOFTMMU) += machine.o -obj-y += cpu.o intrpt.o mmu.o translate.o -obj-y += intrpt_helper.o mmu_helper.o +obj-y += cpu.o excp.o intrpt.o mmu.o translate.o +obj-y += excp_helper.o intrpt_helper.o mmu_helper.o diff --git a/target-openrisc/excp.c b/target-openrisc/excp.c new file mode 100644 index 0000000..6d8c5dd --- /dev/null +++ b/target-openrisc/excp.c @@ -0,0 +1,27 @@ +/* + * OpenRISC exception. + * + * Copyright (c) 2011-2012 Jia Liu + * + * 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 . + */ + +#include "cpu.h" +#include "excp.h" + +void QEMU_NORETURN raise_exception(CPUOpenRISCState *env, uint32_t excp) +{ + env->exception_index = excp; + cpu_loop_exit(env); +} diff --git a/target-openrisc/excp.h b/target-openrisc/excp.h new file mode 100644 index 0000000..885203b --- /dev/null +++ b/target-openrisc/excp.h @@ -0,0 +1,28 @@ +/* + * OpenRISC exception header. + * + * Copyright (c) 2011-2012 Jia Liu + * + * 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 . + */ + +#ifndef QEMU_OPENRISC_EXCP_H +#define QEMU_OPENRISC_EXCP_H + +#include "cpu.h" +#include "qemu-common.h" + +void QEMU_NORETURN raise_exception(CPUOpenRISCState *env, uint32_t excp); + +#endif /* QEMU_OPENRISC_EXCP_H */ diff --git a/target-openrisc/excp_helper.c b/target-openrisc/excp_helper.c new file mode 100644 index 0000000..c7d4110 --- /dev/null +++ b/target-openrisc/excp_helper.c @@ -0,0 +1,27 @@ +/* + * OpenRISC exception helper routines + * + * Copyright (c) 2011-2012 Jia Liu + * + * 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 . + */ + +#include "cpu.h" +#include "helper.h" +#include "excp.h" + +void HELPER(exception)(CPUOpenRISCState *env, uint32_t excp) +{ + raise_exception(env, excp); +} diff --git a/target-openrisc/helper.h b/target-openrisc/helper.h index 16d99b6..4e2a49f 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)