From patchwork Tue Sep 18 12:58:54 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ronald Hecht X-Patchwork-Id: 184707 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 DD2F82C009A for ; Tue, 18 Sep 2012 23:01:24 +1000 (EST) Received: from localhost ([::1]:53806 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDxQZ-0000eM-1Z for incoming@patchwork.ozlabs.org; Tue, 18 Sep 2012 09:01:23 -0400 Received: from eggs.gnu.org ([208.118.235.92]:50697) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDxQP-0000e1-Iy for qemu-devel@nongnu.org; Tue, 18 Sep 2012 09:01:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1TDxQJ-0003AK-Q4 for qemu-devel@nongnu.org; Tue, 18 Sep 2012 09:01:13 -0400 Received: from [212.211.133.158] (port=40176 helo=rhe.ulm.sysgo.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1TDxQJ-0003A6-GN for qemu-devel@nongnu.org; Tue, 18 Sep 2012 09:01:07 -0400 Received: from rhe.ulm.sysgo.com (localhost [127.0.0.1]) by rhe.ulm.sysgo.com (8.14.3/8.14.3/Debian-9.4) with ESMTP id q8ICx4tP009830; Tue, 18 Sep 2012 14:59:04 +0200 Received: (from rhe@localhost) by rhe.ulm.sysgo.com (8.14.3/8.14.3/Submit) id q8ICx4i4009828; Tue, 18 Sep 2012 14:59:04 +0200 From: Ronald Hecht To: qemu-devel@nongnu.org Date: Tue, 18 Sep 2012 14:58:54 +0200 Message-Id: <1347973134-9796-1-git-send-email-ronald.hecht@gmx.de> X-Mailer: git-send-email 1.7.2.5 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 3) X-Received-From: 212.211.133.158 Cc: blauwirbel@gmail.com, Ronald Hecht , chouteau@adacore.com Subject: [Qemu-devel] [PATCH] SPARC LEON power-down support added 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 Signed-off-by: Ronald Hecht --- target-sparc/cpu.c | 2 +- target-sparc/cpu.h | 1 + target-sparc/helper.h | 1 + target-sparc/ldst_helper.c | 9 +++++++++ target-sparc/translate.c | 5 +++++ 5 files changed, 17 insertions(+), 1 deletions(-) diff --git a/target-sparc/cpu.c b/target-sparc/cpu.c index 0d5abb8..10563c4 100644 --- a/target-sparc/cpu.c +++ b/target-sparc/cpu.c @@ -589,7 +589,7 @@ static const sparc_def_t sparc_defs[] = { .mmu_trcr_mask = 0xffffffff, .nwindows = 8, .features = CPU_DEFAULT_FEATURES | CPU_FEATURE_TA0_SHUTDOWN | - CPU_FEATURE_ASR17 | CPU_FEATURE_CACHE_CTRL, + CPU_FEATURE_ASR17 | CPU_FEATURE_CACHE_CTRL | CPU_FEATURE_POWERDOWN, }, #endif }; diff --git a/target-sparc/cpu.h b/target-sparc/cpu.h index e16b7b3..eadc445 100644 --- a/target-sparc/cpu.h +++ b/target-sparc/cpu.h @@ -270,6 +270,7 @@ typedef struct sparc_def_t { #define CPU_FEATURE_TA0_SHUTDOWN (1 << 14) /* Shutdown on "ta 0x0" */ #define CPU_FEATURE_ASR17 (1 << 15) #define CPU_FEATURE_CACHE_CTRL (1 << 16) +#define CPU_FEATURE_POWERDOWN (1 << 17) #ifndef TARGET_SPARC64 #define CPU_DEFAULT_FEATURES (CPU_FEATURE_FLOAT | CPU_FEATURE_SWAP | \ diff --git a/target-sparc/helper.h b/target-sparc/helper.h index e3c7fdd..74ecad1 100644 --- a/target-sparc/helper.h +++ b/target-sparc/helper.h @@ -4,6 +4,7 @@ DEF_HELPER_1(rett, void, env) DEF_HELPER_2(wrpsr, void, env, tl) DEF_HELPER_1(rdpsr, tl, env) +DEF_HELPER_1(power_down, void, env) #else DEF_HELPER_2(wrpil, void, env, tl) DEF_HELPER_2(wrpstate, void, env, tl) diff --git a/target-sparc/ldst_helper.c b/target-sparc/ldst_helper.c index 684b73b..bb5016c 100644 --- a/target-sparc/ldst_helper.c +++ b/target-sparc/ldst_helper.c @@ -2317,6 +2317,15 @@ void helper_stqf(CPUSPARCState *env, target_ulong addr, int mem_idx) #endif } +void helper_power_down(CPUSPARCState *env) +{ + env->halted = 1; + env->exception_index = EXCP_HLT; + env->pc = env->npc; + env->npc = env->pc + 4; + cpu_loop_exit(env); +} + #if !defined(CONFIG_USER_ONLY) #ifndef TARGET_SPARC64 void cpu_unassigned_access(CPUSPARCState *env, target_phys_addr_t addr, diff --git a/target-sparc/translate.c b/target-sparc/translate.c index b95f91c..9babaa8 100644 --- a/target-sparc/translate.c +++ b/target-sparc/translate.c @@ -3671,6 +3671,11 @@ static void disas_sparc_insn(DisasContext * dc, unsigned int insn) in the SPARCv8 manual, nop on the microSPARC II */ + if ((rd == 0x13) && (dc->def->features & + CPU_FEATURE_POWERDOWN)) { + /* LEON3 power-down */ + gen_helper_power_down(cpu_env); + } break; #else case 0x2: /* V9 wrccr */