Skip to content

Commit 98e77e9

Browse files
rmalmainrmalmain
committed
fix compilation issues
1 parent f60854c commit 98e77e9

File tree

5 files changed

+23
-16
lines changed

5 files changed

+23
-16
lines changed

‎accel/tcg/tcg-all.c‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,8 @@
4040
#endif
4141
#include "internal-common.h"
4242

43+
#include "cpu.h"
44+
4345
struct TCGState {
4446
AccelState parent_obj;
4547

‎include/exec/helper-gen.h.inc‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
106106
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5), dh_arg_decl(t6, 6), \
107107
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8)) \
108108
{ \
109-
tcg_gen_call8(&glue(helper_info_, name), dh_retvar(ret), \
109+
tcg_gen_call8(glue(helper_info_,name).func, \
110+
&glue(helper_info_,name), dh_retvar(ret), \
110111
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
111112
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
112113
dh_arg(t7, 7), dh_arg(t8, 8)); \
@@ -120,7 +121,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
120121
dh_arg_decl(t4, 4), dh_arg_decl(t5, 5), dh_arg_decl(t6, 6), \
121122
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9)) \
122123
{ \
123-
tcg_gen_call9(&glue(helper_info_, name), dh_retvar(ret), \
124+
tcg_gen_call9(glue(helper_info_,name).func, \
125+
&glue(helper_info_,name), dh_retvar(ret), \
124126
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
125127
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
126128
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9)); \
@@ -135,7 +137,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
135137
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9), \
136138
dh_arg_decl(t10, 10)) \
137139
{ \
138-
tcg_gen_call10(&glue(helper_info_, name), dh_retvar(ret), \
140+
tcg_gen_call10(glue(helper_info_,name).func, \
141+
&glue(helper_info_,name), dh_retvar(ret), \
139142
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
140143
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
141144
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9), \
@@ -151,7 +154,8 @@ static inline void glue(gen_helper_, name)(dh_retvar_decl(ret) \
151154
dh_arg_decl(t7, 7), dh_arg_decl(t8, 8), dh_arg_decl(t9, 9), \
152155
dh_arg_decl(t10, 10), dh_arg_decl(t11, 11)) \
153156
{ \
154-
tcg_gen_call11(&glue(helper_info_, name), dh_retvar(ret), \
157+
tcg_gen_call11(glue(helper_info_,name).func, \
158+
&glue(helper_info_,name), dh_retvar(ret), \
155159
dh_arg(t1, 1), dh_arg(t2, 2), dh_arg(t3, 3), \
156160
dh_arg(t4, 4), dh_arg(t5, 5), dh_arg(t6, 6), \
157161
dh_arg(t7, 7), dh_arg(t8, 8), dh_arg(t9, 9), \

‎tcg/tcg.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2491,37 +2491,37 @@ void tcg_gen_call7(void *func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1,
24912491
tcg_gen_callN(func, info, ret, args);
24922492
}
24932493

2494-
void tcg_gen_call8(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
2494+
void tcg_gen_call8(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
24952495
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
24962496
TCGTemp *t7, TCGTemp *t8)
24972497
{
24982498
TCGTemp *args[8] = { t1, t2, t3, t4, t5, t6, t7, t8 };
2499-
tcg_gen_callN(info, ret, args);
2499+
tcg_gen_callN(func, info, ret, args);
25002500
}
25012501

2502-
void tcg_gen_call9(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
2502+
void tcg_gen_call9(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
25032503
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
25042504
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9)
25052505
{
25062506
TCGTemp *args[9] = { t1, t2, t3, t4, t5, t6, t7, t8, t9 };
2507-
tcg_gen_callN(info, ret, args);
2507+
tcg_gen_callN(func, info, ret, args);
25082508
}
25092509

2510-
void tcg_gen_call10(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
2510+
void tcg_gen_call10(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
25112511
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
25122512
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9, TCGTemp *t10)
25132513
{
25142514
TCGTemp *args[10] = { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10 };
2515-
tcg_gen_callN(info, ret, args);
2515+
tcg_gen_callN(func, info, ret, args);
25162516
}
25172517

2518-
void tcg_gen_call11(TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
2518+
void tcg_gen_call11(void* func, TCGHelperInfo *info, TCGTemp *ret, TCGTemp *t1, TCGTemp *t2,
25192519
TCGTemp *t3, TCGTemp *t4, TCGTemp *t5, TCGTemp *t6,
25202520
TCGTemp *t7, TCGTemp *t8, TCGTemp *t9, TCGTemp *t10,
25212521
TCGTemp *t11)
25222522
{
25232523
TCGTemp *args[11] = { t1, t2, t3, t4, t5, t6, t7, t8, t9, t10, t11 };
2524-
tcg_gen_callN(info, ret, args);
2524+
tcg_gen_callN(func, info, ret, args);
25252525
}
25262526

25272527
static void tcg_reg_alloc_start(TCGContext *s)

‎tests/unit/check-sym-runtime.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
#include "qemu/osdep.h"
1818
#include "tcg/tcg.h"
1919
#include "hw/i386/topology.h"
20-
#include "target/i386/cpu.h"
20+
#include "cpu.h"
2121
#include "exec/helper-proto.h"
2222

2323
#define SymExpr void*

‎tests/unit/meson.build‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,10 @@ foreach test_name, extra: tests
201201
# embeds most of qemu objects, including SymQEMU
202202
lwith += [lib]
203203
args += ['-I../target/i386/',
204-
'-DCONFIG_TARGET="x86_64-linux-user-config-target.h"',
205-
'-DNEED_CPU_H',
206-
'-Ix86_64-linux-user']
204+
'-DCOMPILING_PER_TARGET',
205+
'-DCONFIG_TARGET="x86_64-linux-user-config-target.h"',
206+
'-DNEED_CPU_H',
207+
'-Ix86_64-linux-user']
207208

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

0 commit comments

Comments
 (0)