MSYS test (#852)
* MSYS test using new cmocka msys package * Update .appveyor.yml * temp package install before real ones get uploaded to db * Update .appveyor.yml * Update .appveyor.yml * Update .appveyor.yml * Update Makefile * Update test_x86_shl_enter_leave.c * Update Makefile * Update threaded_emu_start.c * Update .appveyor.yml * remove unused install
This commit is contained in:
Stephen
Nguyen Anh Quynh
parent
821245e766
commit
7f116846c0
|
|
@ -2,7 +2,7 @@
|
|||
environment:
|
||||
CYG_MIRROR: http://cygwin.mirror.constant.com
|
||||
CYG_PACKAGES: make,gcc-core,clang,pkg-config,libpcre-devel,cmake,python-setuptools,ruby,mingw64-i686-gcc-core,mingw64-x86_64-gcc-core
|
||||
MSYS_PACKAGES: cmake
|
||||
MSYS_PACKAGES: mingw-w64-x86_64-cmocka mingw-w64-i686-cmocka mingw-w64-x86_64-python2-setuptools mingw-w64-i686-python2-setuptools
|
||||
matrix:
|
||||
- MSYSTEM: MINGW64
|
||||
BASH: C:\msys64\usr\bin\bash
|
||||
|
|
@ -41,7 +41,7 @@ install:
|
|||
- ps: if (Test-Path Env:\CYG_ROOT) { Start-FileDownload "http://cygwin.com/$env:CYG_SETUP" -FileName "$env:CYG_SETUP" }
|
||||
- if defined CYG_ROOT (%CYG_SETUP% --quiet-mode --no-shortcuts --only-site --root "%CYG_ROOT%" --site "%CYG_MIRROR%" --local-package-dir "%CYG_CACHE%" --packages "%CYG_PACKAGES%" --upgrade-also)
|
||||
- if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm ${MSYS_PACKAGES}")
|
||||
- if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm")
|
||||
- if defined MSYSTEM (%BASH% -lc "pacman -Suuy --noconfirm ${MSYS_PACKAGES}")
|
||||
build_script:
|
||||
- if defined BASH (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && make")
|
||||
- if "%MSYSTEM%" == "MINGW64" (%BASH% -lc "cd $(cygpath ${APPVEYOR_BUILD_FOLDER}) && make -C bindings/go")
|
||||
|
|
@ -55,3 +55,4 @@ build_script:
|
|||
# Test cygwin only
|
||||
test_script:
|
||||
- if defined CYG_ROOT (%BASH% -lc "cd $APPVEYOR_BUILD_FOLDER && ./install-cmocka-linux.sh && export PATH=$PATH:$APPVEYOR_BUILD_FOLDER:$APPVEYOR_BUILD_FOLDER/cmocka/src && make test")
|
||||
- if defined MSYSTEM (%BASH% -lc "cd $APPVEYOR_BUILD_FOLDER && export PATH=$PATH:$APPVEYOR_BUILD_FOLDER && make test")
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
CFLAGS += -Wall -Werror -I../../include
|
||||
CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
|
||||
LDLIBS += -L../../ -lm -lunicorn
|
||||
|
||||
UNAME_S := $(shell uname -s)
|
||||
|
|
|
|||
|
|
@ -181,14 +181,14 @@ int main(int argc, char **argv, char **envp)
|
|||
th = (HANDLE)_beginthreadex(NULL, 0, win32_emu_starter, &starter_params, CREATE_SUSPENDED, NULL);
|
||||
if(th == (HANDLE)-1)
|
||||
{
|
||||
printf("Failed on _beginthreadex() with error returned: %u\n", _errno());
|
||||
printf("Failed on _beginthreadex() with error returned: %p\n", _errno());
|
||||
return -1;
|
||||
}
|
||||
// start thread
|
||||
ret = ResumeThread(th);
|
||||
if( ret == -1 )
|
||||
{
|
||||
printf("Failed on ResumeThread() with error returned: %u\n", _errno());
|
||||
printf("Failed on ResumeThread() with error returned: %p\n", _errno());
|
||||
return -2;
|
||||
}
|
||||
// wait 3 seconds
|
||||
|
|
|
|||
|
|
@ -1,4 +1,5 @@
|
|||
CFLAGS += -Wall -Werror -Wno-unused-function -g
|
||||
CFLAGS += -D__USE_MINGW_ANSI_STDIO=1
|
||||
CFLAGS += -L ../../ -I ../../include
|
||||
CFLAGS += -L ../../cmocka/src -I ../../cmocka/include
|
||||
|
||||
|
|
|
|||
|
|
@ -82,14 +82,14 @@ void hook_code_test_i386_shl(uc_engine *uc, uint64_t address, uint32_t size, voi
|
|||
instruction* currInst = getInstruction(b, (uint32_t)address);
|
||||
assert_true(currInst != NULL);
|
||||
|
||||
print_message("|\teip=%08x - %s\n", (uint32_t)address, currInst->asmStr);
|
||||
printf("|\teip=%08x - %s\n", (uint32_t)address, currInst->asmStr);
|
||||
|
||||
for (i = 0; i < currInst->nbValues; i++)
|
||||
{
|
||||
uint32_t regValue = getRegisterValue(uc, currInst->values[i].regId);
|
||||
print_message("|\t\ttesting %s : ", getRegisterName(currInst->values[i].regId));
|
||||
printf("|\t\ttesting %s : ", getRegisterName(currInst->values[i].regId));
|
||||
assert_int_equal(regValue & currInst->values[i].mask, currInst->values[i].regValue);
|
||||
print_message("ok\n");
|
||||
printf("ok\n");
|
||||
}
|
||||
|
||||
if (currInst->code[0] == 0xCC)
|
||||
|
|
@ -101,17 +101,17 @@ bool hook_mem_invalid(uc_engine *uc, uc_mem_type type, uint64_t addr, int size,
|
|||
switch (type)
|
||||
{
|
||||
default:
|
||||
print_message("hook_mem_invalid: UC_HOOK_MEM_INVALID type: %d at 0x%" PRIx64 "\n", type, addr); break;
|
||||
printf("hook_mem_invalid: UC_HOOK_MEM_INVALID type: %d at 0x%" PRIx64 "\n", type, addr); break;
|
||||
case UC_MEM_READ_UNMAPPED:
|
||||
print_message("hook_mem_invalid: Read from invalid memory at 0x%" PRIx64 ", data size = %u\n", addr, size); break;
|
||||
printf("hook_mem_invalid: Read from invalid memory at 0x%" PRIx64 ", data size = %u\n", addr, size); break;
|
||||
case UC_MEM_WRITE_UNMAPPED:
|
||||
print_message("hook_mem_invalid: Write to invalid memory at 0x%" PRIx64 ", data size = %u, data value = 0x%" PRIx64 "\n", addr, size, value); break;
|
||||
printf("hook_mem_invalid: Write to invalid memory at 0x%" PRIx64 ", data size = %u, data value = 0x%" PRIx64 "\n", addr, size, value); break;
|
||||
case UC_MEM_FETCH_PROT:
|
||||
print_message("hook_mem_invalid: Fetch from non-executable memory at 0x%" PRIx64 "\n", addr); break;
|
||||
printf("hook_mem_invalid: Fetch from non-executable memory at 0x%" PRIx64 "\n", addr); break;
|
||||
case UC_MEM_WRITE_PROT:
|
||||
print_message("hook_mem_invalid: Write to non-writeable memory at 0x%" PRIx64 ", data size = %u, data value = 0x%" PRIx64 "\n", addr, size, value); break;
|
||||
printf("hook_mem_invalid: Write to non-writeable memory at 0x%" PRIx64 ", data size = %u, data value = 0x%" PRIx64 "\n", addr, size, value); break;
|
||||
case UC_MEM_READ_PROT:
|
||||
print_message("hook_mem_invalid: Read from non-readable memory at 0x%" PRIx64 ", data size = %u\n", addr, size); break;
|
||||
printf("hook_mem_invalid: Read from non-readable memory at 0x%" PRIx64 ", data size = %u\n", addr, size); break;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
|
@ -310,10 +310,10 @@ uint32_t loadBlock(uc_engine *_uc, block* _block, uint32_t _at)
|
|||
const uint32_t codeSize = _block->insts[i]->codeSize;
|
||||
const uint8_t* code = _block->insts[i]->code;
|
||||
_block->insts[i]->addr = _at + offset;
|
||||
print_message("load: %08X: ", _block->insts[i]->addr);
|
||||
for (j = 0; j < codeSize; j++) print_message("%02X ", code[j]);
|
||||
for (j = 0; j < 15 - codeSize; j++) print_message(" ");
|
||||
print_message("%s\n", _block->insts[i]->asmStr);
|
||||
printf("load: %08X: ", _block->insts[i]->addr);
|
||||
for (j = 0; j < codeSize; j++) printf("%02X ", code[j]);
|
||||
for (j = 0; j < 15 - codeSize; j++) printf(" ");
|
||||
printf("%s\n", _block->insts[i]->asmStr);
|
||||
OK(uc_mem_write(_uc, _at + offset, code, codeSize));
|
||||
offset += codeSize;
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue