darkkirb/old-trainOS
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Adds config for malloc magic block number. Fixes bug in NativeMethod: Flips parameter list.

Browse source
This commit is contained in:
Felix Queissner 2015-08-17 15:41:11 +02:00
parent e69a342b29
commit 90eb432c50
3 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/config.h
View file

@ -11,3 +11,7 @@
/*
#define USE_VERBOSE_FREE
//*/
//*
#define USE_MAGIC_SECURED_MALLOC
//*/

12
src/malloc.c
View file

@ -9,7 +9,9 @@
typedef struct List
{
#if defined(USE_MAGIC_SECURED_MALLOC)
size_t magic;
#endif
size_t length;
size_t used;
struct List *next;
@ -30,9 +32,11 @@ static void print_list()
serial_printf(SERIAL_COM1, "malloc list: \n");
while(list != nullptr)
{
#if defined(USE_MAGIC_SECURED_MALLOC)
if(list->magic != 0xDEADBEEF) {
die("malloc::print_list.InvalidMagicNumber");
}
#endif
serial_printf(SERIAL_COM1, "[%x -> %x] %d %d\n", list, list->next, list->used, list->length);
list = list->next;
}
@ -69,9 +73,9 @@ void *malloc(size_t len)
listBegin->length = (intptr_t)malloc_heap_end - (intptr_t)malloc_heap_start - sizeof(List);
listBegin->used = 0;
listBegin->next = nullptr;
#if defined(USE_MAGIC_SECURED_MALLOC)
listBegin->magic = 0xDEADBEEF;
print_list();
#endif
}
List *cursor = listBegin;
@ -107,7 +111,9 @@ void *malloc(size_t len)
newl->length = newLength;
newl->used = 0;
newl->next = cursor->next;
#if defined(USE_MAGIC_SECURED_MALLOC)
newl->magic = 0xDEADBEEF;
#endif
cursor->next = newl;
}
@ -141,9 +147,11 @@ void free(void *ptr)
if(entry->used == 0) {
die_extra("free.InvalidBlock", itoa(ptr, nullptr, 16));
}
#if defined(USE_MAGIC_SECURED_MALLOC)
if(entry->magic != 0xDEADBEEF) {
die_extra("free.InvalidBlockMagic: ", itoa(entry->magic, nullptr, 16));
}
#endif
if(entry->length > 0x5000) {
die_extra("free.InvalidSizedBlock: ", itoa(entry->length, nullptr, 10));

4
src/vm.cpp
View file

@ -80,7 +80,7 @@ Variable NativeMethod::invoke(Vector<Variable> arguments)
// Copy arguments
size_t stackSize = 0;
for(int i = 0; i < arguments.length(); i++) {
for(size_t i = 0; i < arguments.length(); i++) {
if(arguments[i].type != this->parameters[i]) {
// die_extra("NativeMethod.InvalidArgumentType", arguments[i].type.name());
}
@ -94,7 +94,7 @@ Variable NativeMethod::invoke(Vector<Variable> arguments)
uint8_t *stack = (uint8_t*)malloc(stackSize);
uint8_t *stackPtr = stack;
for(int i = arguments.length() - 1; i >= 0; i--) {
for(size_t i = 0; i < arguments.length(); i++) {
switch(arguments[i].type.id) {
case TypeID::Bool:
*reinterpret_cast<Int*>(stackPtr) = arguments[i].boolean ? 1 : 0;