King_DuckZ/wrenpp
1
1
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove hardcoded binary data, get it from the corresponding assembly instead.

Browse source
This commit is contained in:
King_DuckZ 2020-04-26 20:37:12 +02:00
parent ca067109a2
commit 2c2d783730
3 changed files with 14 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
meson.build
View file

@ -12,6 +12,7 @@ executable(meson.project_name(),
'src/wren/configuration.cpp', 'src/wren/configuration.cpp',
'src/wren/def_configuration.cpp', 'src/wren/def_configuration.cpp',
'src/wren/dynafunc_maker.cpp', 'src/wren/dynafunc_maker.cpp',
'src/dynafunc_amd64_gnu.S',
dependencies: [wren_dep], dependencies: [wren_dep],
install: true, install: true,
) )

6
src/dynafunc_amd64_gnu.asm → src/dynafunc_amd64_gnu.S
View file

@ -2,8 +2,12 @@
#objcopy -j .text -O binary dynafunc.o dynafunc.bin #objcopy -j .text -O binary dynafunc.o dynafunc.bin
#xxd -i dynafunc.bin #xxd -i dynafunc.bin
dynafunc: .global g_dynafunc
.global g_dynafunc_end
g_dynafunc:
movq $0xdeadbeefdeadbeef, %rdi movq $0xdeadbeefdeadbeef, %rdi
movq $0xbadc0ffee0ddf00d, %rdx movq $0xbadc0ffee0ddf00d, %rdx
jmp *%rdx jmp *%rdx
ret ret
g_dynafunc_end:

18
src/wren/dynafunc_maker.cpp
View file

@ -14,13 +14,12 @@
namespace wren { namespace wren {
namespace { namespace {
#if defined(__amd64__) and defined(__gnu_linux__)
//see src/dynafunc_amd64_gnu.asm //see src/dynafunc_amd64_gnu.asm
const constexpr unsigned char g_dynafunc[] = { extern "C" const char g_dynafunc[];
0x48, 0xbf, 0xef, 0xbe, 0xad, 0xde, 0xef, 0xbe, 0xad, 0xde, 0x48, 0xba, extern "C" const char g_dynafunc_end[];
0x0d, 0xf0, 0xdd, 0xe0, 0xfe, 0x0f, 0xdc, 0xba, 0xff, 0xe2, 0xc3 const unsigned int g_dynafunc_len = g_dynafunc_end - g_dynafunc;
};
const constexpr unsigned int g_dynafunc_len = 23; #if defined(__amd64__) and defined(__gnu_linux__)
const constexpr unsigned int g_dynafunc_ptr1_size = 8; const constexpr unsigned int g_dynafunc_ptr1_size = 8;
const constexpr unsigned int g_dynafunc_ptr2_size = 8; const constexpr unsigned int g_dynafunc_ptr2_size = 8;
const constexpr unsigned char g_dynafunc_ptr1[g_dynafunc_ptr1_size] = {0xef, 0xbe, 0xad, 0xde, 0xef, 0xbe, 0xad, 0xde}; const constexpr unsigned char g_dynafunc_ptr1[g_dynafunc_ptr1_size] = {0xef, 0xbe, 0xad, 0xde, 0xef, 0xbe, 0xad, 0xde};
@ -43,9 +42,8 @@ namespace wren {
std::copy(ptr, ptr + sizeof(T), subseq); std::copy(ptr, ptr + sizeof(T), subseq);
} }
void make_dynafunc_asm(unsigned char* out, unsigned int len, VM* ptr1, foreign_method_t ptr2) { void make_dynafunc_asm(unsigned char* out, VM* ptr1, foreign_method_t ptr2) {
assert(g_dynafunc_len == len); std::copy(g_dynafunc, g_dynafunc_end, out);
std::copy(g_dynafunc, g_dynafunc + g_dynafunc_len, out);
replace_ptr(out, out + g_dynafunc_len, g_dynafunc_ptr1, ptr1); replace_ptr(out, out + g_dynafunc_len, g_dynafunc_ptr1, ptr1);
replace_ptr(out, out + g_dynafunc_len, g_dynafunc_ptr2, ptr2); replace_ptr(out, out + g_dynafunc_len, g_dynafunc_ptr2, ptr2);
@ -69,7 +67,7 @@ namespace wren {
void* DynafuncMaker::make (VM* vm, foreign_method_t cb) { void* DynafuncMaker::make (VM* vm, foreign_method_t cb) {
unsigned char* const mem = allocate_chunk(); unsigned char* const mem = allocate_chunk();
make_dynafunc_asm(mem, g_dynafunc_len, vm, cb); make_dynafunc_asm(mem, vm, cb);
return mem; return mem;
} }