Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ PUB_HEADERS = \
pub/libvex_trc_values.h \
pub/libvex_emnote.h \
pub/libvex_guest_x86.h \
pub/libvex_guest_tilegx.h \
pub/libvex_guest_amd64.h \
pub/libvex_guest_arm.h \
pub/libvex_guest_ppc32.h \
Expand All @@ -27,6 +28,7 @@ PUB_HEADERS = \
# when any of them change
PRIV_HEADERS = \
priv/host_x86_defs.h \
priv/host_tilegx_defs.h \
priv/host_amd64_defs.h \
priv/host_arm_defs.h \
priv/host_ppc_defs.h \
Expand All @@ -43,6 +45,7 @@ PRIV_HEADERS = \
priv/guest_generic_x87.h \
priv/guest_generic_bb_to_IR.h \
priv/guest_x86_defs.h \
priv/guest_tilegx_defs.h \
priv/guest_amd64_defs.h \
priv/guest_arm_defs.h \
priv/guest_ppc_defs.h \
Expand All @@ -61,7 +64,9 @@ NORMAL_OBJS = \
priv/main_globals.o \
priv/main_util.o \
priv/s390_disasm.o \
priv/tilegx_disasm.o \
priv/host_x86_defs.o \
priv/host_tilegx_defs.o \
priv/host_amd64_defs.o \
priv/host_arm_defs.o \
priv/host_arm64_defs.o \
Expand All @@ -70,6 +75,7 @@ NORMAL_OBJS = \
priv/host_s390_defs.o \
priv/host_mips_defs.o \
priv/host_x86_isel.o \
priv/host_tilegx_isel.o \
priv/host_amd64_isel.o \
priv/host_arm_isel.o \
priv/host_arm64_isel.o \
Expand All @@ -87,6 +93,7 @@ NORMAL_OBJS = \
priv/guest_generic_x87.o \
priv/guest_generic_bb_to_IR.o \
priv/guest_x86_helpers.o \
priv/guest_tilegx_helpers.o \
priv/guest_amd64_helpers.o \
priv/guest_arm_helpers.o \
priv/guest_arm64_helpers.o \
Expand All @@ -95,6 +102,7 @@ NORMAL_OBJS = \
priv/guest_s390_helpers.o \
priv/guest_mips_helpers.o \
priv/guest_x86_toIR.o \
priv/guest_tilegx_toIR.o \
priv/guest_amd64_toIR.o \
priv/guest_arm_toIR.o \
priv/guest_arm64_toIR.o \
Expand Down
6 changes: 3 additions & 3 deletions priv/guest_tilegx_toIR.c
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ static DisResult disInstr_TILEGX_WRK ( Bool(*resteerOkFn) (void *, Addr),
Bool sigill_diag )
{
struct tilegx_decoded_instruction
decoded[TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE];
decoded[TILEGX_MAX_INSTRUCTIONS_PER_BUNDLE + 1];
ULong cins, opcode = -1, rd, ra, rb, imm = 0;
ULong opd[4];
ULong opd_src_map, opd_dst_map, opd_imm_map;
Expand Down Expand Up @@ -414,7 +414,7 @@ static DisResult disInstr_TILEGX_WRK ( Bool(*resteerOkFn) (void *, Addr),

/* To decode the given instruction bundle. */
nr_insn = parse_insn_tilegx((tilegx_bundle_bits)cins,
(ULong)(Addr)code,
(ULong)(Addr)(guest_PC_bbstart + delta),
decoded);

if (vex_traceflags & VEX_TRACE_FE)
Expand Down Expand Up @@ -2570,7 +2570,7 @@ disInstr_TILEGX ( IRSB* irsb_IN,
irsb = irsb_IN;
host_endness = host_endness_IN;
guest_PC_curr_instr = (Addr64) guest_IP;
guest_PC_bbstart = (Addr64) toUInt(guest_IP - delta);
guest_PC_bbstart = guest_PC_curr_instr - delta;

dres = disInstr_TILEGX_WRK(resteerOkFn, resteerCisOk,
callback_opaque,
Expand Down
2 changes: 1 addition & 1 deletion priv/main_main.c
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@
#define MIPS64ST(f) vassert(0)
#endif

#if defined(VGA_tilegx) //|| defined(VEXMULTIARCH)
#if defined(VGA_tilegx) || defined(VEXMULTIARCH)
#define TILEGXFN(f) f
#define TILEGXST(f) f
#else
Expand Down