qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Alexander Graf <agraf@suse.de>
To: qemu-devel@nongnu.org
Cc: Peter Maydell <peter.maydell@linaro.org>,
	Michael Matz <matz@suse.de>,
	C Fontana <claudio.fontana@linaro.org>,
	Dirk Mueller <dmueller@suse.de>,
	Laurent Desnogues <laurent.desnogues@gmail.com>,
	Christoffer Dall <christoffer.dall@linaro.org>,
	Richard Henderson <rth@twiddle.net>
Subject: [Qemu-devel] [PATCH 14/60] AArch64: Add orr instruction emulation
Date: Fri, 27 Sep 2013 02:48:08 +0200	[thread overview]
Message-ID: <1380242934-20953-15-git-send-email-agraf@suse.de> (raw)
In-Reply-To: <1380242934-20953-1-git-send-email-agraf@suse.de>

This patch adds emulation support for the orr instruction.

Signed-off-by: Alexander Graf <agraf@suse.de>
---
 target-arm/helper-a64.c    |  28 +++++++++++
 target-arm/helper-a64.h    |   1 +
 target-arm/translate-a64.c | 120 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 149 insertions(+)

diff --git a/target-arm/helper-a64.c b/target-arm/helper-a64.c
index 8105fb5..da72b7f 100644
--- a/target-arm/helper-a64.c
+++ b/target-arm/helper-a64.c
@@ -24,3 +24,31 @@
 #include "sysemu/sysemu.h"
 #include "qemu/bitops.h"
 
+uint32_t HELPER(pstate_add)(uint32_t pstate, uint64_t a1, uint64_t a2,
+                            uint64_t ar)
+{
+    int64_t s1 = a1;
+    int64_t s2 = a2;
+    int64_t sr = ar;
+
+    pstate &= ~(PSTATE_N | PSTATE_Z | PSTATE_C | PSTATE_V);
+
+    if (sr < 0) {
+        pstate |= PSTATE_N;
+    }
+
+    if (!ar) {
+        pstate |= PSTATE_Z;
+    }
+
+    if (ar && (ar < a1)) {
+        pstate |= PSTATE_C;
+    }
+
+    if ((s1 > 0 && s2 > 0 && sr < 0) ||
+        (s1 < 0 && s2 < 0 && sr > 0)) {
+        pstate |= PSTATE_V;
+    }
+
+    return pstate;
+}
diff --git a/target-arm/helper-a64.h b/target-arm/helper-a64.h
index 30ecf78..1492b15 100644
--- a/target-arm/helper-a64.h
+++ b/target-arm/helper-a64.h
@@ -17,3 +17,4 @@
  * License along with this library; if not, see <http://www.gnu.org/licenses/>.
  */
 
+DEF_HELPER_FLAGS_4(pstate_add, TCG_CALL_NO_RWG_SE, i32, i32, i64, i64, i64)
diff --git a/target-arm/translate-a64.c b/target-arm/translate-a64.c
index 039e73a..2a80715 100644
--- a/target-arm/translate-a64.c
+++ b/target-arm/translate-a64.c
@@ -484,6 +484,123 @@ static void handle_ldarx(DisasContext *s, uint32_t insn)
     tcg_temp_free_i64(tcg_addr);
 }
 
+static TCGv_i64 get_shift(int reg, int shift_type, TCGv_i64 tcg_shift,
+                          int is_32bit)
+{
+    TCGv_i64 r;
+
+    r = tcg_temp_new_i64();
+
+    /* XXX carry_out */
+    switch (shift_type) {
+    case 0: /* LSL */
+        tcg_gen_shl_i64(r, cpu_reg(reg), tcg_shift);
+        break;
+    case 1: /* LSR */
+        tcg_gen_shr_i64(r, cpu_reg(reg), tcg_shift);
+        break;
+    case 2: /* ASR */
+        if (is_32bit) {
+            TCGv_i64 tcg_tmp = tcg_temp_new_i64();
+            tcg_gen_ext32s_i64(tcg_tmp, cpu_reg(reg));
+            tcg_gen_sar_i64(r, tcg_tmp, tcg_shift);
+            tcg_temp_free_i64(tcg_tmp);
+        } else {
+            tcg_gen_sar_i64(r, cpu_reg(reg), tcg_shift);
+        }
+        break;
+    case 3:
+        tcg_gen_rotr_i64(r, cpu_reg(reg), tcg_shift);
+        break;
+    }
+
+    return r;
+}
+
+static TCGv_i64 get_shifti(int reg, int shift_type, int shift, int is_32bit)
+{
+    TCGv_i64 tcg_shift;
+    TCGv_i64 r;
+
+    if (!shift) {
+        r = tcg_temp_new_i64();
+        tcg_gen_mov_i64(r, cpu_reg(reg));
+        return r;
+    }
+
+    tcg_shift = tcg_const_i64(shift);
+    r = get_shift(reg, shift_type, tcg_shift, is_32bit);
+    tcg_temp_free_i64(tcg_shift);
+
+    return r;
+}
+
+static void handle_orr(DisasContext *s, uint32_t insn)
+{
+    int is_32bit = !get_bits(insn, 31, 1);
+    int dest = get_reg(insn);
+    int source = get_bits(insn, 5, 5);
+    int rm = get_bits(insn, 16, 5);
+    int shift_amount = get_sbits(insn, 10, 6);
+    int is_n = get_bits(insn, 21, 1);
+    int shift_type = get_bits(insn, 22, 2);
+    int opc = get_bits(insn, 29, 2);
+    bool setflags = (opc == 0x3);
+    TCGv_i64 tcg_op2;
+    TCGv_i64 tcg_dest;
+
+    if (is_32bit && (shift_amount < 0)) {
+        /* reserved value */
+        unallocated_encoding(s);
+    }
+
+    /* MOV is dest = xzr & (source & ~0) */
+    if (!shift_amount && source == 0x1f) {
+        if (is_32bit) {
+            tcg_gen_ext32u_i64(cpu_reg_sp(dest), cpu_reg(rm));
+        } else {
+            tcg_gen_mov_i64(cpu_reg_sp(dest), cpu_reg(rm));
+        }
+        if (is_n) {
+            tcg_gen_not_i64(cpu_reg_sp(dest), cpu_reg_sp(dest));
+        }
+        if (is_32bit) {
+            tcg_gen_ext32u_i64(cpu_reg_sp(dest), cpu_reg_sp(dest));
+        }
+        return;
+    }
+
+    tcg_op2 = get_shifti(rm, shift_type, shift_amount & (is_32bit ? 31 : 63),
+                         is_32bit);
+    if (is_n) {
+        tcg_gen_not_i64(tcg_op2, tcg_op2);
+    }
+
+    tcg_dest = cpu_reg(dest);
+    switch (opc) {
+    case 0x0:
+    case 0x3:
+        tcg_gen_and_i64(tcg_dest, cpu_reg(source), tcg_op2);
+        break;
+    case 0x1:
+        tcg_gen_or_i64(tcg_dest, cpu_reg(source), tcg_op2);
+        break;
+    case 0x2:
+        tcg_gen_xor_i64(tcg_dest, cpu_reg(source), tcg_op2);
+        break;
+    }
+
+    if (is_32bit) {
+        tcg_gen_ext32u_i64(tcg_dest, tcg_dest);
+    }
+
+    if (setflags) {
+        gen_helper_pstate_add(pstate, pstate, tcg_dest, cpu_reg(31), tcg_dest);
+    }
+
+    tcg_temp_free_i64(tcg_op2);
+}
+
 void disas_a64_insn(CPUARMState *env, DisasContext *s)
 {
     uint32_t insn;
@@ -516,6 +633,9 @@ void disas_a64_insn(CPUARMState *env, DisasContext *s)
             handle_ldarx(s, insn);
         }
         break;
+    case 0x0a:
+        handle_orr(s, insn);
+        break;
     case 0x0c:
         if (get_bits(insn, 29, 1)) {
             handle_stp(s, insn);
-- 
1.7.12.4

  parent reply	other threads:[~2013-09-27  0:49 UTC|newest]

Thread overview: 115+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-27  0:47 [Qemu-devel] [PATCH 00/60] AArch64 TCG emulation support Alexander Graf
2013-09-27  0:47 ` [Qemu-devel] [PATCH 01/60] arm: Use symbolic device names for vfp cmp Alexander Graf
2013-09-27  0:47 ` [Qemu-devel] [PATCH 02/60] arm: Give the fpscr rounding modes names Alexander Graf
2013-09-27  0:47 ` [Qemu-devel] [PATCH 03/60] arm: Split VFP cmp from FPSCR setting Alexander Graf
2013-09-27 14:05   ` Richard Henderson
2013-09-27 22:38     ` Richard Henderson
2013-09-27  0:47 ` [Qemu-devel] [PATCH 04/60] arm: Add AArch64 disassembler stub Alexander Graf
2013-09-27 14:07   ` Richard Henderson
2013-09-27  0:47 ` [Qemu-devel] [PATCH 05/60] softfloat: Add stubs for int16 conversion Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 06/60] AArch64: Add set_pc cpu method Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 07/60] ARM: Add 64bit VFP handling Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 08/60] AArch64: Add support to print VFP registers in CPU Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 09/60] AArch64: Add b and bl handling Alexander Graf
2013-09-27  9:11   ` Claudio Fontana
2013-09-27 14:40   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 10/60] AArch64: Add handling for br instructions Alexander Graf
2013-09-27 14:51   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 11/60] AArch64: Add STP instruction emulation Alexander Graf
2013-09-27 17:38   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 12/60] AArch64: Add ldarx style " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 13/60] AArch64: Add stubs for a64 specific helpers Alexander Graf
2013-09-27  0:48 ` Alexander Graf [this message]
2013-09-27 18:25   ` [Qemu-devel] [PATCH 14/60] AArch64: Add orr instruction emulation Richard Henderson
2013-10-31  0:29     ` Alexander Graf
2013-10-31  1:44       ` Peter Maydell
2013-11-18 10:15     ` Claudio Fontana
2013-11-18 10:37       ` Laurent Desnogues
2013-11-18 13:12       ` Michael Matz
2013-11-18 13:15         ` Peter Maydell
2013-11-18 13:24           ` Claudio Fontana
2013-11-18 13:46           ` Michael Matz
2013-11-18 13:49             ` Peter Maydell
2013-11-18 13:43         ` Claudio Fontana
2013-11-18 13:44           ` Peter Maydell
2013-11-18 13:55           ` Michael Matz
2013-11-18 19:51             ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 15/60] AArch64: Add add instruction family emulation Alexander Graf
2013-09-27 18:51   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 16/60] AArch64: Add emulation for SIMD ld/st multiple Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 17/60] AArch64: Add dup GPR->Vec instruction emulation Alexander Graf
2013-09-27 18:55   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 18/60] AArch64: Add umov " Alexander Graf
2013-09-27 18:56   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 19/60] AArch64: Add ins GPR->Vec " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 20/60] AArch64: Add SIMD ORR family " Alexander Graf
2013-09-27 19:21   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 21/60] AArch64: Convert SIMD load/store to common function Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 22/60] AArch64: Add AdvSIMD scalar three same group handling Alexander Graf
2013-09-27 19:24   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 23/60] AArch64: Add AdvSIMD modified immediate " Alexander Graf
2013-11-19 20:23   ` Janne Grunau
2013-09-27  0:48 ` [Qemu-devel] [PATCH 24/60] AArch64: Add SIMD ushll instruction emulation Alexander Graf
2013-09-27 19:29   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 25/60] AArch64: Add SIMD shl " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 26/60] AArch64: Add ADR " Alexander Graf
2013-11-19 17:17   ` Claudio Fontana
2013-11-19 17:52     ` Claudio Fontana
2013-11-19 18:03       ` Peter Maydell
2013-11-19 18:09         ` Peter Maydell
2013-11-20 14:40     ` Michael Matz
2013-09-27  0:48 ` [Qemu-devel] [PATCH 27/60] AArch64: Add addi " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 28/60] AArch64: Add movi " Alexander Graf
2013-09-27 19:38   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 29/60] AArch64: Add orri " Alexander Graf
2013-09-27 19:42   ` Richard Henderson
2013-11-26 11:56     ` Claudio Fontana
2013-11-26 12:05       ` Laurent Desnogues
2013-11-27 21:56       ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 30/60] AArch64: Add extr " Alexander Graf
2013-09-27 19:45   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 31/60] AArch64: Add bfm family " Alexander Graf
2013-09-27 20:01   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 32/60] AArch64: Add svc " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 33/60] AArch64: Add bc " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 34/60] AArch64: Add b.cond " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 35/60] AArch64: Add mrs " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 36/60] AArch64: Add msr " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 37/60] AArch64: Add hint " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 38/60] AArch64: Add stub barrier " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 39/60] AArch64: Add stub sys " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 40/60] AArch64: Add tbz " Alexander Graf
2013-09-27 20:50   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 41/60] AArch64: Add ldr/str instruction family emulation Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 42/60] AArch64: Add literal ld instruction emulation Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 43/60] AArch64: Add cinc " Alexander Graf
2013-09-27 20:52   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 44/60] AArch64: Add division instruction family emulation Alexander Graf
2013-09-27 20:54   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 45/60] AArch64: Add shift " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 46/60] AArch64: Add rev " Alexander Graf
2013-09-27 21:07   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 47/60] AArch64: Add clz instruction emulation Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 48/60] AArch64: Add 0x1a encoding of add instructions Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 49/60] AArch64: Add "Data-processing (3 source)" instruction Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 50/60] AArch64: Add "Floating-point<->fixed-point Alexander Graf
2013-11-19 20:41   ` Janne Grunau
2013-11-20 14:47     ` Michael Matz
2013-11-21 12:34       ` Janne Grunau
2013-11-21 12:40         ` Peter Maydell
2013-09-27  0:48 ` [Qemu-devel] [PATCH 51/60] AArch64: Add fmov (scalar, immediate) instruction Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 52/60] AArch64: Add "Floating-point<->integer conversions" Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 53/60] AArch64: Add "Floating-point compare" instruction Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 54/60] AArch64: Add "Floating-point data-processing (1 Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 55/60] " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 56/60] AArch64: Add "Floating-point data-processing (2 Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 57/60] " Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 58/60] AArch64: Add "ADD (vector)" instruction emulation Alexander Graf
2013-09-27  0:48 ` [Qemu-devel] [PATCH 59/60] AArch64: Add "Floating-point data-processing (3 Alexander Graf
2013-09-27 21:34   ` Richard Henderson
2013-09-27  0:48 ` [Qemu-devel] [PATCH 60/60] " Alexander Graf
2013-09-27  1:02 ` [Qemu-devel] [PATCH 00/60] AArch64 TCG emulation support Alexander Graf
2013-09-27  2:30   ` Peter Maydell
2013-09-27 10:39     ` Alexander Graf
2013-10-16 19:54 ` Edgar E. Iglesias
2013-10-17 12:23   ` Alexander Graf

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1380242934-20953-15-git-send-email-agraf@suse.de \
    --to=agraf@suse.de \
    --cc=christoffer.dall@linaro.org \
    --cc=claudio.fontana@linaro.org \
    --cc=dmueller@suse.de \
    --cc=laurent.desnogues@gmail.com \
    --cc=matz@suse.de \
    --cc=peter.maydell@linaro.org \
    --cc=qemu-devel@nongnu.org \
    --cc=rth@twiddle.net \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).