christoph/wamr
1
Fork 0
Code Releases Activity

Change wasm app offset type from int32 to uint32 (#361)

Browse Source 
And fix some sign/unsigned conversion compilation warnings.
This commit is contained in:
Wenyong Huang
2020-08-26 18:33:29 +08:00
committed by GitHub
parent 049760b849
commit 034606b0a9
20 changed files with 191 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/iwasm/interpreter/wasm.h
View File

@ -479,7 +479,8 @@ wasm_type_equal(const WASMType *type1, const WASMType *type2)
return (type1->param_count == type2->param_count
&& type1->result_count == type2->result_count
&& memcmp(type1->types, type2->types,
type1->param_count + type1->result_count) == 0)
(uint32)(type1->param_count
+ type1->result_count)) == 0)
? true : false;
}

6
core/iwasm/interpreter/wasm_loader.c
View File

@ -1191,10 +1191,14 @@ load_memory(const uint8 **p_buf, const uint8 *buf_end, WASMMemory *memory,
return false;
}
#else
if (memory->flags > 3 || memory->flags == 2) {
if (memory->flags > 3) {
set_error_buf(error_buf, error_buf_size, "integer too large");
return false;
}
else if (memory->flags == 2) {
set_error_buf(error_buf, error_buf_size, "shared memory must have maximum");
return false;
}
#endif
read_leb_uint32(p, p_end, memory->init_page_count);

36
core/iwasm/interpreter/wasm_runtime.c
View File

@ -1562,7 +1562,7 @@ wasm_get_exception(WASMModuleInstance *module_inst)
return module_inst->cur_exception;
}
int32
uint32
wasm_module_malloc(WASMModuleInstance *module_inst, uint32 size,
void **p_native_addr)
{
@ -1589,15 +1589,15 @@ wasm_module_malloc(WASMModuleInstance *module_inst, uint32 size,
}
if (p_native_addr)
*p_native_addr = addr;
return (int32)(addr - memory->memory_data);
return (uint32)(addr - memory->memory_data);
}
void
wasm_module_free(WASMModuleInstance *module_inst, int32 ptr)
wasm_module_free(WASMModuleInstance *module_inst, uint32 ptr)
{
if (ptr) {
WASMMemoryInstance *memory = module_inst->default_memory;
uint8 *addr = memory->memory_data + (uint32)ptr;
uint8 *addr = memory->memory_data + ptr;
if (memory->heap_handle
&& memory->heap_data <= addr
@ -1610,18 +1610,18 @@ wasm_module_free(WASMModuleInstance *module_inst, int32 ptr)
&& addr < memory->memory_data_end) {
execute_free_function(module_inst,
module_inst->free_function,
(uint32)ptr);
ptr);
}
}
}
int32
uint32
wasm_module_dup_data(WASMModuleInstance *module_inst,
const char *src, uint32 size)
{
char *buffer;
int32 buffer_offset = wasm_module_malloc(module_inst, size,
(void**)&buffer);
uint32 buffer_offset = wasm_module_malloc(module_inst, size,
(void**)&buffer);
if (buffer_offset != 0) {
buffer = wasm_addr_app_to_native(module_inst, buffer_offset);
bh_memcpy_s(buffer, size, src, size);
@ -1631,18 +1631,18 @@ wasm_module_dup_data(WASMModuleInstance *module_inst,
bool
wasm_validate_app_addr(WASMModuleInstance *module_inst,
int32 app_offset, uint32 size)
uint32 app_offset, uint32 size)
{
WASMMemoryInstance *memory = module_inst->default_memory;
uint32 memory_data_size =
memory->num_bytes_per_page * memory->cur_page_count;
/* integer overflow check */
if ((uint32)app_offset + size < (uint32)app_offset) {
if (app_offset + size < app_offset) {
goto fail;
}
if ((uint32)app_offset + size <= memory_data_size) {
if (app_offset + size <= memory_data_size) {
return true;
}
fail:
@ -1673,7 +1673,7 @@ fail:
void *
wasm_addr_app_to_native(WASMModuleInstance *module_inst,
int32 app_offset)
uint32 app_offset)
{
WASMMemoryInstance *memory = module_inst->default_memory;
uint8 *addr = memory->memory_data + app_offset;
@ -1684,7 +1684,7 @@ wasm_addr_app_to_native(WASMModuleInstance *module_inst,
return NULL;
}
int32
uint32
wasm_addr_native_to_app(WASMModuleInstance *module_inst,
void *native_ptr)
{
@ -1693,21 +1693,21 @@ wasm_addr_native_to_app(WASMModuleInstance *module_inst,
if (memory->memory_data <= addr
&& addr < memory->memory_data_end)
return (int32)(addr - memory->memory_data);
return (uint32)(addr - memory->memory_data);
return 0;
}
bool
wasm_get_app_addr_range(WASMModuleInstance *module_inst,
int32 app_offset,
int32 *p_app_start_offset,
int32 *p_app_end_offset)
uint32 app_offset,
uint32 *p_app_start_offset,
uint32 *p_app_end_offset)
{
WASMMemoryInstance *memory = module_inst->default_memory;
uint32 memory_data_size =
memory->num_bytes_per_page * memory->cur_page_count;
if ((uint32)app_offset < memory_data_size) {
if (app_offset < memory_data_size) {
if (p_app_start_offset)
*p_app_start_offset = 0;
if (p_app_end_offset)

20
core/iwasm/interpreter/wasm_runtime.h
View File

@ -313,24 +313,24 @@ wasm_set_exception(WASMModuleInstance *module, const char *exception);
const char*
wasm_get_exception(WASMModuleInstance *module);
int32
uint32
wasm_module_malloc(WASMModuleInstance *module_inst, uint32 size,
void **p_native_addr);
void
wasm_module_free(WASMModuleInstance *module_inst, int32 ptr);
wasm_module_free(WASMModuleInstance *module_inst, uint32 ptr);
int32
uint32
wasm_module_dup_data(WASMModuleInstance *module_inst,
const char *src, uint32 size);
bool
wasm_validate_app_addr(WASMModuleInstance *module_inst,
int32 app_offset, uint32 size);
uint32 app_offset, uint32 size);
bool
wasm_validate_app_str_addr(WASMModuleInstance *module_inst,
int32 app_offset);
uint32 app_offset);
bool
wasm_validate_native_addr(WASMModuleInstance *module_inst,
@ -338,17 +338,17 @@ wasm_validate_native_addr(WASMModuleInstance *module_inst,
void *
wasm_addr_app_to_native(WASMModuleInstance *module_inst,
int32 app_offset);
uint32 app_offset);
int32
uint32
wasm_addr_native_to_app(WASMModuleInstance *module_inst,
void *native_ptr);
bool
wasm_get_app_addr_range(WASMModuleInstance *module_inst,
int32 app_offset,
int32 *p_app_start_offset,
int32 *p_app_end_offset);
uint32 app_offset,
uint32 *p_app_start_offset,
uint32 *p_app_end_offset);
bool
wasm_get_native_addr_range(WASMModuleInstance *module_inst,