Fix 32 bits targets.

Warning: problem with arm-linux-user.

Author: rmalmain

accel/tcg/tcg-runtime-sym-common.c

@@ -59,7 +59,8 @@ void *build_and_push_path_constraint(CPUArchState *env, void *arg1_expr, void *a
 /* Architecture-independent way to get the program counter */
 target_ulong get_pc(CPUArchState *env)
 {
-    target_ulong pc, cs_base;
+    vaddr pc;
+    uint64_t cs_base;
     uint32_t flags;
 
     cpu_get_tb_cpu_state(env, &pc, &cs_base, &flags);

accel/tcg/tcg-runtime-sym.c

@@ -313,22 +313,22 @@ static void *sym_load_guest_internal(CPUArchState *env,
 }
 
 void *HELPER(sym_load_guest_i32)(CPUArchState *env,
-                                 target_ulong addr, void *addr_expr,
-                                 uint64_t length, target_ulong mmu_idx)
+                                 uint64_t addr, void *addr_expr,
+                                 uint64_t length, uint64_t mmu_idx)
 {
     return sym_load_guest_internal(env, addr, addr_expr, length, 4, mmu_idx);
 }
 
 void *HELPER(sym_load_guest_i64)(CPUArchState *env,
-                                 target_ulong addr, void *addr_expr,
-                                 uint64_t length, target_ulong mmu_idx)
+                                 uint64_t addr, void *addr_expr,
+                                 uint64_t length, uint64_t mmu_idx)
 {
     return sym_load_guest_internal(env, addr, addr_expr, length, 8, mmu_idx);
 }
 
 static void sym_store_guest_internal(CPUArchState *env,
                                      uint64_t value, void *value_expr,
-                                     target_ulong addr, void *addr_expr,
+                                     uint64_t addr, void *addr_expr,
                                      uint64_t length, target_ulong mmu_idx)
 {
     /* Try an alternative address */
@@ -344,17 +344,17 @@ static void sym_store_guest_internal(CPUArchState *env,
 
 void HELPER(sym_store_guest_i32)(CPUArchState *env,
                                  uint32_t value, void *value_expr,
-                                 target_ulong addr, void *addr_expr,
-                                 uint64_t length, target_ulong mmu_idx)
+                                 uint64_t addr, void *addr_expr,
+                                 uint64_t length, uint64_t mmu_idx)
 {
     return sym_store_guest_internal(
         env, value, value_expr, addr, addr_expr, length, mmu_idx);
 }
 
 void HELPER(sym_store_guest_i64)(CPUArchState *env,
                                  uint64_t value, void *value_expr,
-                                 target_ulong addr, void *addr_expr,
-                                 uint64_t length, target_ulong mmu_idx)
+                                 uint64_t addr, void *addr_expr,
+                                 uint64_t length, uint64_t mmu_idx)
 {
     return sym_store_guest_internal(
         env, value, value_expr, addr, addr_expr, length, mmu_idx);

configure

@@ -1676,7 +1676,7 @@ mkdir -p tests/tcg
 echo "# Automatically generated by configure - do not modify" > $config_host_mak
 echo "SRC_PATH=$source_path" >> $config_host_mak
 if test "$plugins" = "yes" ; then
-    echo "CONFIG_PLUGIN=y" >> tests/tcg/$config_host_mak
+    echo "CONFIG_PLUGIN=y" >> $config_host_mak
 fi
 
 tcg_tests_targets=

meson.build

@@ -1083,7 +1083,7 @@ endif
 
 symcc_rt_backend = get_option('symcc_rt_backend')
 
-if not fs.is_file('subprojects/symcc-rt/RuntimeCommon.h')
+if not fs.is_file('subprojects/symcc-rt/include/RuntimeCommon.h')
   error('''Symcc Runtime does not seem to be present.
 Did you initialize the symcc-rt submodule? (git submodule update --init --recursive subprojects/symcc-rt)''')
 endif
@@ -1099,9 +1099,9 @@ symcc_rt_vars.add_cmake_defines({
 
 symcc_rt_proj = cmake.subproject('symcc-rt', options: symcc_rt_vars)
 if get_option('symcc_rt_shared')
-  symcc_rt = symcc_rt_proj.dependency('SymccRtShared')
+  symcc_rt = symcc_rt_proj.dependency('SymCCRtShared')
 else
-  symcc_rt = symcc_rt_proj.dependency('SymccRtStatic')
+  symcc_rt = symcc_rt_proj.dependency('SymCCRtStatic')
 endif
 
 mpathlibs = [libudev]

target/i386/tcg/translate.c

@@ -3604,7 +3604,15 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
             if (dflag == MO_16) {
                 tcg_gen_ext16u_tl(s->T0, s->T0);
             }
+#if TARGET_LONG_BITS == 32
+            TCGv_i64 call_addr = tcg_temp_new_i64();
+            tcg_gen_extu_i32_i64(call_addr, eip_next_tl(s));
+            gen_helper_sym_notify_call(call_addr);
+#elif TARGET_LONG_BITS == 64
             gen_helper_sym_notify_call(eip_next_tl(s));
+#else
+#error Unhandled TARGET_LONG_BITS value
+#endif
             gen_push_v(s, eip_next_tl(s));
             gen_op_jmp_v(s, s->T0);
             gen_bnd_jmp(s);
@@ -5064,7 +5072,15 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
         val = x86_ldsw_code(env, s);
         ot = gen_pop_T0(s);
         gen_stack_update(s, val + (1 << ot));
+#if TARGET_LONG_BITS == 32
+        TCGv_i64 ret_addr = tcg_temp_new_i64();
+        tcg_gen_extu_i32_i64(ret_addr, s->T0);
+        gen_helper_sym_notify_return(ret_addr);
+#elif TARGET_LONG_BITS == 64
         gen_helper_sym_notify_return(s->T0);
+#else
+#error Unhandled TARGET_LONG_BITS value
+#endif
         /* Note that gen_pop_T0 uses a zero-extending load.  */
         gen_op_jmp_v(s, s->T0);
         gen_bnd_jmp(s);
@@ -5073,7 +5089,15 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
     case 0xc3: /* ret */
         ot = gen_pop_T0(s);
         gen_pop_update(s, ot);
+#if TARGET_LONG_BITS == 32
+        TCGv_i64 ret_addr2 = tcg_temp_new_i64();
+        tcg_gen_extu_i32_i64(ret_addr2, s->T0);
+        gen_helper_sym_notify_return(ret_addr2);
+#elif TARGET_LONG_BITS == 64
         gen_helper_sym_notify_return(s->T0);
+#else
+#error Unhandled TARGET_LONG_BITS value
+#endif
         /* Note that gen_pop_T0 uses a zero-extending load.  */
         gen_op_jmp_v(s, s->T0);
         gen_bnd_jmp(s);
@@ -5126,7 +5150,15 @@ static bool disas_insn(DisasContext *s, CPUState *cpu)
             int diff = (dflag != MO_16
                         ? (int32_t)insn_get(env, s, MO_32)
                         : (int16_t)insn_get(env, s, MO_16));
+#if TARGET_LONG_BITS == 32
+            TCGv_i64 call_addr = tcg_temp_new_i64();
+            tcg_gen_extu_i32_i64(call_addr, eip_next_tl(s));
+            gen_helper_sym_notify_call(call_addr);
+#elif TARGET_LONG_BITS == 64
             gen_helper_sym_notify_call(eip_next_tl(s));
+#else
+#error Unhandled TARGET_LONG_BITS value
+#endif
             gen_push_v(s, eip_next_tl(s));
             gen_bnd_jmp(s);
             gen_jmp_rel(s, dflag, diff, 0);