Commit 40f9f908 authored by Richard Henderson's avatar Richard Henderson
Browse files

target/hppa: Begin using scripts/decodetree.py 



Convert the BREAK instruction to start.

Tested-by: default avatarHelge Deller <deller@gmx.de>
Tested-by: default avatarSven Schnelle <svens@stackframe.org>
Signed-off-by: default avatarRichard Henderson <richard.henderson@linaro.org>
parent 31234768

target/hppa/Makefile.objs

+8 −0
Original line number Diff line number Diff line 
obj-y += translate.o helper.o cpu.o op_helper.o gdbstub.o mem_helper.o

obj-y += int_helper.o

obj-$(CONFIG_SOFTMMU) += machine.o



DECODETREE = $(SRC_PATH)/scripts/decodetree.py



target/hppa/decode.inc.c: $(SRC_PATH)/target/hppa/insns.decode $(DECODETREE)

	$(call quiet-command,\

	  $(PYTHON) $(DECODETREE) -o $@ $<, "GEN", $(TARGET_DIR)$@)



target/hppa/translate.o: target/hppa/decode.inc.c

target/hppa/insns.decode

0 → 100644
+24 −0
Original line number Diff line number Diff line 
#

# HPPA instruction decode definitions.

#

# Copyright (c) 2018 Richard Henderson <rth@twiddle.net>

#

# 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 <http://www.gnu.org/licenses/>.

#



####

# System

####



break           000000 ----- ----- --- 00000000 -----

target/hppa/translate.c

+19 −5
Original line number Diff line number Diff line
@@ -278,6 +278,9 @@ typedef struct DisasContext { 
    bool psw_n_nonzero;

} DisasContext;



/* Include the auto-generated decoder.  */

#include "decode.inc.c"



/* We are not using a goto_tb (for whatever reason), but have updated

   the iaq (for whatever reason), so don't do it again on exit.  */

#define DISAS_IAQ_N_UPDATED  DISAS_TARGET_0
@@ -661,7 +664,8 @@ static void nullify_set(DisasContext *ctx, bool x) 
}



/* Mark the end of an instruction that may have been nullified.

   This is the pair to nullify_over.  */

   This is the pair to nullify_over.  Always returns true so that

   it may be tail-called from a translate function.  */

static bool nullify_end(DisasContext *ctx)

{

    TCGLabel *null_lab = ctx->null_lab;
@@ -745,12 +749,17 @@ static bool gen_illegal(DisasContext *ctx) 
    return gen_excp_iir(ctx, EXCP_ILL);

}



#ifdef CONFIG_USER_ONLY

#define CHECK_MOST_PRIVILEGED(EXCP) \

    return gen_excp_iir(ctx, EXCP)

#else

#define CHECK_MOST_PRIVILEGED(EXCP) \

    do {                                     \

        if (ctx->privilege != 0) {           \

            return gen_excp_iir(ctx, EXCP);  \

        }                                    \

    } while (0)

#endif



static bool use_goto_tb(DisasContext *ctx, target_ureg dest)

{
@@ -1982,7 +1991,7 @@ static bool trans_nop(DisasContext *ctx, uint32_t insn, const DisasInsn *di) 
    return true;

}



static bool trans_break(DisasContext *ctx, uint32_t insn, const DisasInsn *di)

static bool trans_break(DisasContext *ctx, arg_break *a)

{

    return gen_excp_iir(ctx, EXCP_BREAK);

}
@@ -2308,7 +2317,6 @@ static bool gen_hlt(DisasContext *ctx, int reset) 
#endif /* !CONFIG_USER_ONLY */



static const DisasInsn table_system[] = {

    { 0x00000000u, 0xfc001fe0u, trans_break },

    { 0x00001820u, 0xffe01fffu, trans_mtsp },

    { 0x00001840u, 0xfc00ffffu, trans_mtctl },

    { 0x016018c0u, 0xffe0ffffu, trans_mtsarcm },
@@ -4534,8 +4542,14 @@ static void translate_table_int(DisasContext *ctx, uint32_t insn, 


static void translate_one(DisasContext *ctx, uint32_t insn)

{

    uint32_t opc = extract32(insn, 26, 6);

    uint32_t opc;



    /* Transition to the auto-generated decoder.  */

    if (decode(ctx, insn)) {

        return;

    }



    opc = extract32(insn, 26, 6);

    switch (opc) {

    case 0x00: /* system op */

        translate_table(ctx, insn, table_system);