Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

libcpu/i386/op_helper: properly handle single path build #105

Merged
merged 4 commits into from
Dec 7, 2024
Merged

libcpu/i386/op_helper: properly handle single path build #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
db1b91b
libcpu/i386/op_helper: properly handle single path build
vitalych Oct 27, 2024
b7ddb39
libcpu: fixed hflags initialization in cpu_compute_hflags
vitalych Nov 24, 2024
2d1efb1
testsuite/cadet0: use hard-coded binary instead of building
vitalych Dec 7, 2024
ee0b886
testsuite/basic7-instmon: fixed address extraction
vitalych Dec 7, 2024
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
4 changes: 2 additions & 2 deletions libcpu/src/target-i386/helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
/// \return the value for hflags
///
uint32_t cpu_compute_hflags(const CPUX86State *env) {
uint32_t hflags = 0;
uint32_t hflags = HF_SOFTMMU_MASK;

/* Update CR0 flags */
target_ulong pe_state = (env->cr[0] & CR0_PE_MASK);
Expand Down Expand Up @@ -89,7 +89,7 @@ uint32_t cpu_compute_hflags(const CPUX86State *env) {
hflags |= ((env->segs[R_DS].base | env->segs[R_ES].base | env->segs[R_SS].base) != 0) << HF_ADDSEG_SHIFT;
}

hflags = (env->hflags & ~(HF_SS32_MASK | HF_ADDSEG_MASK)) | hflags;
hflags = (hflags & ~(HF_SS32_MASK | HF_ADDSEG_MASK)) | hflags;

return hflags;
}
Expand Down
14 changes: 7 additions & 7 deletions libcpu/src/target-i386/op_helper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ uint32_t compute_eflags(void) {
return ((uint32_t) env->mflags) | helper_cc_compute_all(CC_OP) | (DF & DF_MASK) | 2;
}

#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
static inline void se_load_eflags(void *mgr, void *eflags, int update_mask) {
void *symb_flags = g_sqi.expr.andc(mgr, eflags, CFLAGS_MASK);
g_sqi.expr.write_cpu(symb_flags, offsetof(CPUX86State, cc_src), sizeof(env->cc_src));
Expand Down Expand Up @@ -952,7 +952,7 @@ static int exeption_has_error_code(int intno) {
sp += 4; \
}

#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && defined(CONFIG_SYMBEX_MP)
#define POPW_T(ssp, sp, sp_mask, val) \
{ \
val = cpu_lduw_kernel(env, (ssp) + (sp & (sp_mask))); \
Expand Down Expand Up @@ -2823,7 +2823,7 @@ static inline void validate_seg(int seg_reg, int cpl) {

/* protected mode iret */
static inline void helper_ret_protected(CPUX86State *env, int shift, int is_iret, int addend, uintptr_t ra) {
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
void *mgr = NULL;
void *symb_new_eflags = NULL;
#endif
Expand All @@ -2850,7 +2850,7 @@ static inline void helper_ret_protected(CPUX86State *env, int shift, int is_iret
POPQ(sp, new_cs);
new_cs &= 0xffff;
if (is_iret) {
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
mgr = g_sqi.expr.mgr();
POPQ_S(mgr, sp, symb_new_eflags);
#else
Expand All @@ -2865,7 +2865,7 @@ static inline void helper_ret_protected(CPUX86State *env, int shift, int is_iret
POPL_T(ssp, sp, sp_mask, new_cs);
new_cs &= 0xffff;
if (is_iret) {
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
mgr = g_sqi.expr.mgr();
POPL_T_S(mgr, ssp, sp, sp_mask, symb_new_eflags);
if (g_sqi.expr.to_constant(g_sqi.expr.andc(mgr, symb_new_eflags, VM_MASK)))
Expand Down Expand Up @@ -2992,7 +2992,7 @@ static inline void helper_ret_protected(CPUX86State *env, int shift, int is_iret
if (shift == 0)
eflags_mask &= 0xffff;

#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
if (symb_new_eflags == NULL) { // 16-bit case no one cares about, let it be concrete
load_eflags(new_eflags, eflags_mask);
} else {
Expand Down Expand Up @@ -3021,7 +3021,7 @@ static inline void helper_ret_protected(CPUX86State *env, int shift, int is_iret
POPL(ssp, sp, sp_mask, new_gs);

/* modify processor state */
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR)
#if defined(CONFIG_SYMBEX) && !defined(SYMBEX_LLVM_LIB) && !defined(STATIC_TRANSLATOR) && defined(CONFIG_SYMBEX_MP)
se_load_eflags(mgr, symb_new_eflags,
TF_MASK | AC_MASK | ID_MASK | IF_MASK | IOPL_MASK | VM_MASK | NT_MASK | VIF_MASK | VIP_MASK);

Expand Down
2 changes: 1 addition & 1 deletion testsuite/basic7-instmon/fix-config.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ echo "Patching s2e-config.lua..."

PROJECT_NAME="$(basename $PROJECT_DIR)"

SCANF_CS_ADDR=$(objdump -S $TARGET | grep scanf | grep call | cut -d ':' -f 1 | xargs)
SCANF_CS_ADDR=$(objdump -S $TARGET | grep scanf | grep call | head -n 1 | cut -d ':' -f 1 | xargs)
if [ "x$SCANF_CS_ADDR" = "x" ]; then
echo "Could not get call site of scanf instruction"
exit 1
Expand Down
Binary file added testsuite/pov-cgc-cadet0/CADET_00001
View file
Open in desktop
Binary file not shown.
7 changes: 0 additions & 7 deletions testsuite/pov-cgc-cadet0/CADET_00001/Makefile
View file
Open in desktop

This file was deleted.

25 changes: 0 additions & 25 deletions testsuite/pov-cgc-cadet0/CADET_00001/README.md
View file
Open in desktop

This file was deleted.

Loading