Skip to content

Commit

Permalink
fix compilation issues
Browse files Browse the repository at this point in the history
  • Loading branch information
@rmalmain
rmalmain committed Oct 26, 2024
1 parent f60854c commit 98e77e9
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 16 deletions.
2 changes: 2 additions & 0 deletions accel/tcg/tcg-all.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@
#endif
#include "internal-common.h"

#include "cpu.h"

struct TCGState {
AccelState parent_obj;

Expand Down
12 changes: 8 additions & 4 deletions include/exec/helper-gen.h.inc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5), dh_arg_decl(t6, 6), \
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8)) \
{ \
tcg_gen_call8(&glue(helper_info_, name), dh_retvar(ret), \
tcg_gen_call8(glue(helper_info_,name).func, \
&glue(helper_info_,name), dh_retvar(ret), \
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
dh_arg(t7, 7), dh_arg(t8, 8)); \
Expand All @@ -120,7 +121,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5), dh_arg_decl(t6, 6), \
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9)) \
{ \
tcg_gen_call9(&glue(helper_info_, name), dh_retvar(ret), \
tcg_gen_call9(glue(helper_info_,name).func, \
&glue(helper_info_,name), dh_retvar(ret), \
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9)); \
Expand All @@ -135,7 +137,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9), \
dh_arg_decl(t10, 10)) \
{ \
tcg_gen_call10(&glue(helper_info_, name), dh_retvar(ret), \
tcg_gen_call10(glue(helper_info_,name).func, \
&glue(helper_info_,name), dh_retvar(ret), \
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9), \
Expand All @@ -151,7 +154,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9), \
dh_arg_decl(t10, 10), dh_arg_decl(t11, 11)) \
{ \
tcg_gen_call11(&glue(helper_info_, name), dh_retvar(ret), \
tcg_gen_call11(glue(helper_info_,name).func, \
&glue(helper_info_,name), dh_retvar(ret), \
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9), \
Expand Down
16 changes: 8 additions & 8 deletions tcg/tcg.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2491,37 +2491,37 @@ void tcg_gen_call7(void *func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1,
tcg_gen_callN(func, info, ret, args);
}

void tcg_gen_call8(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
void tcg_gen_call8(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
TCGTemp *t7, TCGTemp *t8)
{
TCGTemp *args[8] = { t1, t2, t3, t4, t5, t6, t7, t8 };
tcg_gen_callN(info, ret, args);
tcg_gen_callN(func, info, ret, args);
}

void tcg_gen_call9(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
void tcg_gen_call9(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9)
{
TCGTemp *args[9] = { t1, t2, t3, t4, t5, t6, t7, t8, t9 };
tcg_gen_callN(info, ret, args);
tcg_gen_callN(func, info, ret, args);
}

void tcg_gen_call10(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
void tcg_gen_call10(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9, TCGTemp *t10)
{
TCGTemp *args[10] = { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 };
tcg_gen_callN(info, ret, args);
tcg_gen_callN(func, info, ret, args);
}

void tcg_gen_call11(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
void tcg_gen_call11(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9, TCGTemp *t10,
TCGTemp *t11)
{
TCGTemp *args[11] = { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11 };
tcg_gen_callN(info, ret, args);
tcg_gen_callN(func, info, ret, args);
}

static void tcg_reg_alloc_start(TCGContext *s)
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/check-sym-runtime.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#include "qemu/osdep.h"
#include "tcg/tcg.h"
#include "hw/i386/topology.h"
#include "target/i386/cpu.h"
#include "cpu.h"
#include "exec/helper-proto.h"

#define SymExpr void*
Expand Down
7 changes: 4 additions & 3 deletions tests/unit/meson.build
View file
Original file line number Diff line number Diff line change
Expand Up @@ -201,9 +201,10 @@ foreach test_name, extra: tests
# embeds most of qemu objects, including SymQEMU
lwith += [lib]
args += ['-I../target/i386/',
'-DCONFIG_TARGET="x86_64-linux-user-config-target.h"',
'-DNEED_CPU_H',
'-Ix86_64-linux-user']
'-DCOMPILING_PER_TARGET',
'-DCONFIG_TARGET="x86_64-linux-user-config-target.h"',
'-DNEED_CPU_H',
'-Ix86_64-linux-user']

# Create the output file for symcc results
symcc_output=meson.current_build_dir() / 'symcc-tests-output'
Expand Down

0 comments on commit 98e77e9

Please sign in to comment.