david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #9 from schumilo/qemu-nyx-4.2.0-dev-intel

Browse Source 
several changes
This commit is contained in:
Sergej Schumilo 2022-04-07 11:01:57 +02:00 committed by GitHub
commit d86e2b05a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compile_qemu_nyx.sh
View File

@ -45,7 +45,7 @@ compile_libraries (){
echo "[!] compiling libxdc..."
cd libxdc
sudo make install
CFLAGS="-I../capstone_v4/include/" V=1 make libxdc.a
cd ..
echo "[!] libxdc is ready!"
}

2
nyx/hypercall/configuration.h
View File

@ -10,7 +10,7 @@ void handle_hypercall_kafl_set_agent_config(struct kvm_run *run, CPUState *cpu,
#define NYX_HOST_MAGIC 0x4878794e
#define NYX_AGENT_MAGIC 0x4178794e
#define NYX_HOST_VERSION 1
#define NYX_HOST_VERSION 2
#define NYX_AGENT_VERSION 1
typedef struct host_config_s{

14
nyx/memory_access.c
View File

@ -592,12 +592,12 @@ static bool read_memory(uint64_t address, uint64_t* buffer, size_t size, bool re
return true;
}
__attribute__((always_inline))
__attribute__((always_inline)) inline
static bool bit(uint64_t value, uint8_t lsb) {
return (value >> lsb) & 1;
}
__attribute__((always_inline))
__attribute__((always_inline)) inline
static uint64_t bits(uint64_t value, uint8_t lsb, uint8_t msb) {
return (value & ((0xffffffffffffffffull >> (64 - (msb - lsb + 1))) << lsb)) >> lsb;
}
@ -633,7 +633,7 @@ static uint64_t load_entry(uint64_t address, uint64_t index,
}
static void print_page(uint64_t address, uint64_t entry, size_t size, bool s, bool w, bool x) {
fprintf(stderr, " %c%c%c %016llx %zx",
fprintf(stderr, " %c%c%c %016lx %zx",
s ? 's' : 'u', w ? 'w' : 'r', x ? 'x' : '-',
(bits(entry, 12, 51) << 12) & ~(size - 1), size);
}
@ -651,7 +651,7 @@ static void print_48_pte(uint64_t address, uint64_t pde_entry, bool read_from_sn
uint64_t entry = pte_table[i];
if (entry) {
fprintf(stderr, "\n 1 %016llx", address | i << 12, entry);
fprintf(stderr, "\n 1 %016lx [%ld]", address | i << 12, entry);
}
if (!bit(entry, 0)) {
@ -676,7 +676,7 @@ static void print_48_pde(uint64_t address, uint64_t pdpte_entry, bool read_from_
uint64_t entry = pde_table[i];
if (entry) {
fprintf(stderr, "\n 2 %016llx", address | i << 21, entry);
fprintf(stderr, "\n 2 %016lx [%ld]", address | i << 21, entry);
}
if (!bit(entry, 0)) {
@ -704,7 +704,7 @@ static void print_48_pdpte(uint64_t address, uint64_t pml4_entry, bool read_from
uint64_t entry = pdpte_table[i];
if (entry) {
fprintf(stderr, "\n 3 %016llx", address | i << 30, entry);
fprintf(stderr, "\n 3 %016lx [%ld]", address | i << 30, entry);
}
if (!bit(entry, 0)) {
@ -736,7 +736,7 @@ static void print_48_pagetables_(uint64_t cr3, bool read_from_snapshot) {
}
if (entry) {
fprintf(stderr, "\n4 %016llx", address, entry);
fprintf(stderr, "\n4 %016lx [%ld]", address, entry);
}
if (bit(entry, 0)) {