From patchwork Sun Jan 28 23:14:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Henderson X-Patchwork-Id: 126089 Delivered-To: patch@linaro.org Received: by 10.46.84.92 with SMTP id y28csp1974434ljd; Sun, 28 Jan 2018 15:16:08 -0800 (PST) X-Google-Smtp-Source: AH8x227DrMczmAJitNSXfu5S8/5YO6uKAL+8OPCi7Kjv2uu5wjayd+9gEB6ArqyQhh9hb+lItY6Q X-Received: by 10.129.106.4 with SMTP id f4mr15645698ywc.424.1517181368019; Sun, 28 Jan 2018 15:16:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1517181368; cv=none; d=google.com; s=arc-20160816; b=TSmuHkJtu4dyaAsQARdbU1wZDxEAOGVMFoGs4QiUnbdLbRjyfBUgjyEoAFfDMdBvmh T817v/lRKa//Py740giXi9gAQ3VuVi1JYiDplEfnpg7cAWDUK49pdaaNV9dVDHDVmrZQ 3Yxu/LDGCSWlq/zqzulXz7+iTD7TDS2NPYYxndHls73omhVlgfU8PM2f+eMZh9I2Ojms E5fY6KIwI8ElgDOM0noruTthdrl6+sfsqOHNaNJ147TS+hXjSqpJYxJsyjUFPfgC9W0O qwtM21WBbYE2i89OhyvG/hgbEcBbB20AMaKUsqPlo9Cjccsn/4dKPP6ED0NT57hB+SSW vayg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:subject:references:in-reply-to :message-id:date:to:from:dkim-signature:arc-authentication-results; bh=brXWTjbFPaXVnfGAY0bGhpSwtJbt1Ttt4kBn764f5bA=; b=vUJTGH9IdPRSaVuo83UVamvOl4k8mpJfDII47yqwZayTQQ9HcCfKODtqqDAbI+Yn2Q FwxCEvRGnjMk73iJxMYYXkJuIv7mry6Iybc05ps9R0CxETi28BtDkf+M+U7G0fzigwgo y4k5kobruNjYClWdsTSpbhKpJed54LBr2ANXeWPxYV/1cnJDSk2/SBU6L5tPyJmr9lHU pQWr6uCluu2Yxwzm05wim++qe7yweYFf3QmrosIb8iKxI3gB5trvMXmkdcYZy405YqED R4/yJaMDZOH7+9uK/0UwMMXfn8gBwPHIhaGtrEdCknAkYZ4cAYvAevhW6x1g5MKIMRC1 kPJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RRqm0TVn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [2001:4830:134:3::11]) by mx.google.com with ESMTPS id d3si4558122ybj.790.2018.01.28.15.16.07 for (version=TLS1 cipher=AES128-SHA bits=128/128); Sun, 28 Jan 2018 15:16:08 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) client-ip=2001:4830:134:3::11; Authentication-Results: mx.google.com; dkim=fail header.i=@linaro.org header.s=google header.b=RRqm0TVn; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 2001:4830:134:3::11 as permitted sender) smtp.mailfrom=qemu-devel-bounces+patch=linaro.org@nongnu.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1]:44902 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwBD-0002UB-Cf for patch@linaro.org; Sun, 28 Jan 2018 18:16:07 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51883) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1efwAk-0002TQ-Fr for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1efwAi-00086N-OF for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:38 -0500 Received: from mail-pf0-x243.google.com ([2607:f8b0:400e:c00::243]:42889) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1efwAi-00085m-GQ for qemu-devel@nongnu.org; Sun, 28 Jan 2018 18:15:36 -0500 Received: by mail-pf0-x243.google.com with SMTP id b25so3256047pfd.9 for ; Sun, 28 Jan 2018 15:15:36 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=brXWTjbFPaXVnfGAY0bGhpSwtJbt1Ttt4kBn764f5bA=; b=RRqm0TVnXjMJcM1kDz555CxtWsVi6ESz0coR0SfSFCrSWfBFcCSCNUZu2+okZQiv5U ei4i6lS/g+ljVGtIn2nZQdD19LDMbEiNZHREP2wpDGpwm4yxDKL1yUMiHv0IvuEX2HCQ s86OF5fyUKTZbua9ExSpIjmIawggDTjhU5v8U= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=brXWTjbFPaXVnfGAY0bGhpSwtJbt1Ttt4kBn764f5bA=; b=RVukc8fEBix0Ci8kCRTriol8M0HlNtdP9NSjFbuyl+r8zSSOJfAtfEenOxjv2BJ/6W VXXsFBDI7WXQpkfAPO/WQLXnIXeTNbfZzbeN4AEh89hGgxWmpVG2wI0m2kyH+RvDQ6r0 qSGJ5CdHDBcXjTvcC4vLjzr/mY86OLwGpa2IZg0eRtzhvrMUeelyJlgflbBVMfXAcrjh tGvPBwXWhZjHVgUEBsGO6Nq1f4kBYl35UlN94UbfzkEY4KEQQfE1MFI3ta9kUJIskDVZ 2RZShSDKZH5B7HenrayCF+uW+CaK2qkwrPLyNxctrBvRAhXGR0BZ/pDO8x2eAUol1w5W dVSg== X-Gm-Message-State: AKwxytc1/+7xy/kbSPykpMcytPLWf/oMN9D0YeNlBg3/MeUSh6/3Kcpx p/zg/zdM0AowODtPzJN4/AWQjkD6IWE= X-Received: by 10.99.116.23 with SMTP id p23mr20104192pgc.60.1517181335004; Sun, 28 Jan 2018 15:15:35 -0800 (PST) Received: from cloudburst.twiddle.net (174-21-6-47.tukw.qwest.net. [174.21.6.47]) by smtp.gmail.com with ESMTPSA id r27sm26949344pfj.75.2018.01.28.15.15.33 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 28 Jan 2018 15:15:33 -0800 (PST) From: Richard Henderson To: qemu-devel@nongnu.org Date: Sun, 28 Jan 2018 15:14:47 -0800 Message-Id: <20180128231528.22719-3-richard.henderson@linaro.org> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180128231528.22719-1-richard.henderson@linaro.org> References: <20180128231528.22719-1-richard.henderson@linaro.org> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 2607:f8b0:400e:c00::243 Subject: [Qemu-devel] [PULL v4 02/43] target/hppa: Define the rest of the PSW X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: peter.maydell@linaro.org Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: "Qemu-devel" We don't actually do anything with most of the bits yet, but at least they have names and we have somewhere to store them. Signed-off-by: Richard Henderson --- target/hppa/cpu.h | 47 ++++++++++++++++++++++++++++++++++++++++++++++ target/hppa/helper.c | 53 ++++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 86 insertions(+), 14 deletions(-) -- 2.14.3 diff --git a/target/hppa/cpu.h b/target/hppa/cpu.h index 3d170c3cf7..d703e99bf9 100644 --- a/target/hppa/cpu.h +++ b/target/hppa/cpu.h @@ -46,6 +46,52 @@ #define EXCP_SIGILL 4 #define EXCP_SIGFPE 5 +/* Taken from Linux kernel: arch/parisc/include/asm/psw.h */ +#define PSW_I 0x00000001 +#define PSW_D 0x00000002 +#define PSW_P 0x00000004 +#define PSW_Q 0x00000008 +#define PSW_R 0x00000010 +#define PSW_F 0x00000020 +#define PSW_G 0x00000040 /* PA1.x only */ +#define PSW_O 0x00000080 /* PA2.0 only */ +#define PSW_CB 0x0000ff00 +#define PSW_M 0x00010000 +#define PSW_V 0x00020000 +#define PSW_C 0x00040000 +#define PSW_B 0x00080000 +#define PSW_X 0x00100000 +#define PSW_N 0x00200000 +#define PSW_L 0x00400000 +#define PSW_H 0x00800000 +#define PSW_T 0x01000000 +#define PSW_S 0x02000000 +#define PSW_E 0x04000000 +#ifdef TARGET_HPPA64 +#define PSW_W 0x08000000 /* PA2.0 only */ +#else +#define PSW_W 0 +#endif +#define PSW_Z 0x40000000 /* PA1.x only */ +#define PSW_Y 0x80000000 /* PA1.x only */ + +#define PSW_SM (PSW_W | PSW_E | PSW_O | PSW_G | PSW_F \ + | PSW_R | PSW_Q | PSW_P | PSW_D | PSW_I) + +/* ssm/rsm instructions number PSW_W and PSW_E differently */ +#define PSW_SM_I PSW_I /* Enable External Interrupts */ +#define PSW_SM_D PSW_D +#define PSW_SM_P PSW_P +#define PSW_SM_Q PSW_Q /* Enable Interrupt State Collection */ +#define PSW_SM_R PSW_R /* Enable Recover Counter Trap */ +#ifdef TARGET_HPPA64 +#define PSW_SM_E 0x100 +#define PSW_SM_W 0x200 /* PA2.0 only : Enable Wide Mode */ +#else +#define PSW_SM_E 0 +#define PSW_SM_W 0 +#endif + typedef struct CPUHPPAState CPUHPPAState; struct CPUHPPAState { @@ -56,6 +102,7 @@ struct CPUHPPAState { target_ulong cr26; target_ulong cr27; + target_long psw; /* All psw bits except the following: */ target_ulong psw_n; /* boolean */ target_long psw_v; /* in most significant bit */ diff --git a/target/hppa/helper.c b/target/hppa/helper.c index d6d6f06cb0..4231ef3bff 100644 --- a/target/hppa/helper.c +++ b/target/hppa/helper.c @@ -39,10 +39,11 @@ target_ulong cpu_hppa_get_psw(CPUHPPAState *env) /* .........................bcdefgh */ psw |= (psw >> 12) & 0xf; psw |= env->psw_cb_msb << 7; - psw <<= 8; + psw = (psw & 0xff) << 8; - psw |= env->psw_n << 21; - psw |= (env->psw_v < 0) << 17; + psw |= env->psw_n * PSW_N; + psw |= (env->psw_v < 0) * PSW_V; + psw |= env->psw; return psw; } @@ -51,8 +52,9 @@ void cpu_hppa_put_psw(CPUHPPAState *env, target_ulong psw) { target_ulong cb = 0; - env->psw_n = (psw >> 21) & 1; - env->psw_v = -((psw >> 17) & 1); + env->psw = psw & ~(PSW_N | PSW_V | PSW_CB); + env->psw_n = (psw / PSW_N) & 1; + env->psw_v = -((psw / PSW_V) & 1); env->psw_cb_msb = (psw >> 15) & 1; cb |= ((psw >> 14) & 1) << 28; @@ -106,22 +108,45 @@ void hppa_cpu_dump_state(CPUState *cs, FILE *f, { HPPACPU *cpu = HPPA_CPU(cs); CPUHPPAState *env = &cpu->env; + target_ulong psw = cpu_hppa_get_psw(env); + target_ulong psw_cb; + char psw_c[20]; int i; - cpu_fprintf(f, "IA_F " TARGET_FMT_lx - " IA_B " TARGET_FMT_lx - " PSW " TARGET_FMT_lx - " [N:" TARGET_FMT_ld " V:%d" - " CB:" TARGET_FMT_lx "]\n ", - env->iaoq_f, env->iaoq_b, cpu_hppa_get_psw(env), - env->psw_n, env->psw_v < 0, - ((env->psw_cb >> 4) & 0x01111111) | (env->psw_cb_msb << 28)); - for (i = 1; i < 32; i++) { + cpu_fprintf(f, "IA_F " TARGET_FMT_lx " IA_B " TARGET_FMT_lx "\n", + env->iaoq_f, env->iaoq_b); + + psw_c[0] = (psw & PSW_W ? 'W' : '-'); + psw_c[1] = (psw & PSW_E ? 'E' : '-'); + psw_c[2] = (psw & PSW_S ? 'S' : '-'); + psw_c[3] = (psw & PSW_T ? 'T' : '-'); + psw_c[4] = (psw & PSW_H ? 'H' : '-'); + psw_c[5] = (psw & PSW_L ? 'L' : '-'); + psw_c[6] = (psw & PSW_N ? 'N' : '-'); + psw_c[7] = (psw & PSW_X ? 'X' : '-'); + psw_c[8] = (psw & PSW_B ? 'B' : '-'); + psw_c[9] = (psw & PSW_C ? 'C' : '-'); + psw_c[10] = (psw & PSW_V ? 'V' : '-'); + psw_c[11] = (psw & PSW_M ? 'M' : '-'); + psw_c[12] = (psw & PSW_F ? 'F' : '-'); + psw_c[13] = (psw & PSW_R ? 'R' : '-'); + psw_c[14] = (psw & PSW_Q ? 'Q' : '-'); + psw_c[15] = (psw & PSW_P ? 'P' : '-'); + psw_c[16] = (psw & PSW_D ? 'D' : '-'); + psw_c[17] = (psw & PSW_I ? 'I' : '-'); + psw_c[18] = '\0'; + psw_cb = ((env->psw_cb >> 4) & 0x01111111) | (env->psw_cb_msb << 28); + + cpu_fprintf(f, "PSW " TARGET_FMT_lx " CB " TARGET_FMT_lx " %s\n", + psw, psw_cb, psw_c); + + for (i = 0; i < 32; i++) { cpu_fprintf(f, "GR%02d " TARGET_FMT_lx " ", i, env->gr[i]); if ((i % 4) == 3) { cpu_fprintf(f, "\n"); } } + cpu_fprintf(f, "\n"); /* ??? FR */ }