From patchwork Thu Aug 25 21:45:21 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 111678 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [140.186.70.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 8A0C9B70FE for ; Fri, 26 Aug 2011 07:47:01 +1000 (EST) Received: from localhost ([::1]:60181 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwhlK-0000DT-KS for incoming@patchwork.ozlabs.org; Thu, 25 Aug 2011 17:46:58 -0400 Received: from eggs.gnu.org ([140.186.70.92]:43973) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwhkN-0006CT-BG for qemu-devel@nongnu.org; Thu, 25 Aug 2011 17:46:01 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1QwhkG-0000v0-Qx for qemu-devel@nongnu.org; Thu, 25 Aug 2011 17:45:59 -0400 Received: from mail-vx0-f173.google.com ([209.85.220.173]:50134) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1QwhkG-0000r5-I9 for qemu-devel@nongnu.org; Thu, 25 Aug 2011 17:45:52 -0400 Received: by mail-vx0-f173.google.com with SMTP id 32so2354666vxi.4 for ; Thu, 25 Aug 2011 14:45:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=sender:from:to:cc:subject:date:message-id:x-mailer:in-reply-to :references; bh=b/FsbO9WEJo7OdGvMGIZKZKTQYwKOC8tYlrkczkCIvU=; b=tj/IYlknFKMjyyIht/W0Nl8vnVPpPirqvi3hRDcxJ85Y8m+psB7Cf4Zz8rwA6U0GVk W05aSt1i3tlQL8imhCzu1IMC1O0LZBB4oRg59kzMOAKWqO1x9zvesVobJkiajQDN4ASz zLRG9/mMd5Gonzn2aeDzNt4vXKBlcdUE9QQTs= Received: by 10.52.21.201 with SMTP id x9mr344593vde.363.1314308752183; Thu, 25 Aug 2011 14:45:52 -0700 (PDT) Received: from localhost.localdomain (cpe-66-91-180-197.hawaii.res.rr.com [66.91.180.197]) by mx.google.com with ESMTPS id eq10sm688769vdb.4.2011.08.25.14.45.50 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 25 Aug 2011 14:45:51 -0700 (PDT) From: Richard Henderson To: qemu-devel@nongnu.org Date: Thu, 25 Aug 2011 11:45:21 -1000 Message-Id: <1314308722-14495-6-git-send-email-rth@twiddle.net> X-Mailer: git-send-email 1.7.4.4 In-Reply-To: <1314308722-14495-1-git-send-email-rth@twiddle.net> References: <1314308722-14495-1-git-send-email-rth@twiddle.net> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6 (newer, 2) X-Received-From: 209.85.220.173 Subject: [Qemu-devel] [PATCH 5/6] target-alpha: Implement HALT IPR. 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: Richard Henderson --- target-alpha/helper.h | 1 + target-alpha/op_helper.c | 10 ++++++++++ target-alpha/translate.c | 5 +++++ 3 files changed, 16 insertions(+), 0 deletions(-) diff --git a/target-alpha/helper.h b/target-alpha/helper.h index 2dec57e..c352c24 100644 --- a/target-alpha/helper.h +++ b/target-alpha/helper.h @@ -113,6 +113,7 @@ DEF_HELPER_2(stq_c_phys, i64, i64, i64) DEF_HELPER_FLAGS_0(tbia, TCG_CALL_CONST, void) DEF_HELPER_FLAGS_1(tbis, TCG_CALL_CONST, void, i64) +DEF_HELPER_1(halt, void, i64); #endif #include "def-helper.h" diff --git a/target-alpha/op_helper.c b/target-alpha/op_helper.c index 38be234..db5b9e7 100644 --- a/target-alpha/op_helper.c +++ b/target-alpha/op_helper.c @@ -22,6 +22,7 @@ #include "host-utils.h" #include "softfloat.h" #include "helper.h" +#include "sysemu.h" #include "qemu-timer.h" #define FP_STATUS (env->fp_status) @@ -1218,6 +1219,15 @@ void helper_tbis(uint64_t p) { tlb_flush_page(env, p); } + +void helper_halt(uint64_t restart) +{ + if (restart) { + qemu_system_reset_request(); + } else { + qemu_system_shutdown_request(); + } +} #endif /*****************************************************************************/ diff --git a/target-alpha/translate.c b/target-alpha/translate.c index 86343df..842f915 100644 --- a/target-alpha/translate.c +++ b/target-alpha/translate.c @@ -1645,6 +1645,11 @@ static ExitStatus gen_mtpr(DisasContext *ctx, int rb, int regno) tcg_gen_st32_i64(tmp, cpu_env, offsetof(CPUState, halted)); return gen_excp(ctx, EXCP_HLT, 0); + case 252: + /* HALT */ + gen_helper_halt(tmp); + return EXIT_PC_STALE; + default: /* The basic registers are data only, and unknown registers are read-zero, write-ignore. */