Timerix/TCPU
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

store current_pos in VM for better logging

Browse Source
This commit is contained in:
Timerix
2024-11-16 22:05:20 +05:00
parent 83172df776
commit 9d2a26fae3
12 changed files with 110 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/instructions/impl/EXIT.c
View File

@@ -2,7 +2,7 @@
/// EXIT
/// ax - exit code
i32 EXIT_impl(VM* vm, size_t pos){
i32 EXIT_impl(VM* vm){
vm->state = VMState_Exited;
return 0;
}

4
src/instructions/impl/MOV.c
View File

@@ -1,13 +1,13 @@
#include "impl_macros.h"
/// MOV [dst_register] [src_register]
i32 MOV_impl(VM* vm, size_t pos){
i32 MOV_impl(VM* vm){
u8 dst_register_i = 0;
readRegisterVar(dst_register_i);
u8 src_register_i = 0;
readRegisterVar(src_register_i);
if(dst_register_i == src_register_i){
VM_setErrorMessage(vm, "[%p] dst_register_i == src_register_i (%x) ", (void*)pos, src_register_i);
VM_setError(vm, "dst_register_i == src_register_i (%x) ", src_register_i);
return -1;
}

2
src/instructions/impl/NOP.c
View File

@@ -1,6 +1,6 @@
#include "impl_macros.h"
/// NOP
i32 NOP_impl(VM* vm, size_t pos){
i32 NOP_impl(VM* vm){
return 0;
}

4
src/instructions/impl/PUSH.c
View File

@@ -1,14 +1,14 @@
#include "impl_macros.h"
/// PUSH [dst_register] [value_size] [value]
i32 PUSH_impl(VM* vm, size_t pos){
i32 PUSH_impl(VM* vm){
u8 dst_register_i = 0;
readRegisterVar(dst_register_i);
u8 value_size = 0;
readValueSizeVar(value_size);
vm->registers[dst_register_i].u32v = 0;
if(!VM_dataRead(vm, &vm->registers[dst_register_i].u32v, pos, value_size))
if(!VM_dataRead(vm, &vm->registers[dst_register_i].u32v, vm->current_pos, value_size))
return -1;
return sizeof(dst_register_i) + sizeof(value_size) + value_size;

12
src/instructions/impl/SYS.c
View File

@@ -1,13 +1,13 @@
#include "impl_macros.h"
FILE* NULLABLE(fileFromN)(VM* vm, size_t pos, u32 file_n){
FILE* NULLABLE(fileFromN)(VM* vm, u32 file_n){
FILE* f = NULL;
switch(file_n){
case 0: f = stdin; break;
case 1: f = stdout; break;
case 2: f = stderr; break;
default:
VM_setErrorMessage(vm, "[%p] invalid file_n (%x) ", (void*)pos, file_n);
VM_setError(vm, "invalid file_n (%x) ", file_n);
break;
}
@@ -16,7 +16,7 @@ FILE* NULLABLE(fileFromN)(VM* vm, size_t pos, u32 file_n){
/// SYS
/// ax - func code
i32 SYS_impl(VM* vm, size_t pos){
i32 SYS_impl(VM* vm){
u8 func_code = vm->ax.u8v0;
size_t result_code = 0;
switch(func_code){
@@ -25,17 +25,17 @@ i32 SYS_impl(VM* vm, size_t pos){
// cx - buffer ptr
// dx - buffer size
case 0:;
result_code = fread(vm->data + vm->cx.u32v, 1, vm->dx.u32v, fileFromN(vm, pos, vm->bx.u32v));
result_code = fread(vm->data + vm->cx.u32v, 1, vm->dx.u32v, fileFromN(vm, vm->bx.u32v));
break;
// sys_write
// bx - file n
// cx - buffer ptr
// dx - buffer size
case 1:;
result_code = fwrite(vm->data + vm->cx.u32v, 1, vm->dx.u32v, fileFromN(vm, pos, vm->bx.u32v));
result_code = fwrite(vm->data + vm->cx.u32v, 1, vm->dx.u32v, fileFromN(vm, vm->bx.u32v));
break;
default:
VM_setErrorMessage(vm, "[%p] invalid system call (%x) ", (void*)pos, func_code);
VM_setError(vm, "invalid system call (%x) ", func_code);
return -1;
}

8
src/instructions/impl/impl_macros.h
View File

@@ -2,14 +2,14 @@
#include "../instructions.h"
#define readVar(VAR) {\
if(!VM_dataRead(vm, &VAR, pos, sizeof(VAR))) \
if(!VM_dataRead(vm, &VAR, vm->current_pos, sizeof(VAR))) \
return -1;\
pos += sizeof(VAR);\
vm->current_pos += sizeof(VAR);\
}
#define validateRegisterIndex(VAR) {\
if(VAR > sizeof(vm->registers)){\
VM_setErrorMessage(vm, "[%p] invalid register index (%x)", (void*)pos, VAR);\
VM_setError(vm, "invalid register index (%x)", VAR);\
return -1;\
}\
}
@@ -21,7 +21,7 @@
#define validateValueSize(VAR) {\
if(VAR < 1 || VAR > 4){\
VM_setErrorMessage(vm, "[%p] invalid value_size (%x)", (void*)pos, VAR);\
VM_setError(vm, "invalid value_size (%x)", VAR);\
return -1;\
}\
}

10
src/instructions/impl/math_operators.c
View File

@@ -22,26 +22,26 @@
}
/// ADD [dst_register] [src_register]
i32 ADD_impl(VM* vm, size_t pos){
i32 ADD_impl(VM* vm){
mathOperatorImpl(+);
}
/// SUB [dst_register] [src_register]
i32 SUB_impl(VM* vm, size_t pos){
i32 SUB_impl(VM* vm){
mathOperatorImpl(-);
}
/// MUL [dst_register] [src_register]
i32 MUL_impl(VM* vm, size_t pos){
i32 MUL_impl(VM* vm){
mathOperatorImpl(*)
}
/// DIV [dst_register] [src_register]
i32 DIV_impl(VM* vm, size_t pos){
i32 DIV_impl(VM* vm){
mathOperatorImpl(/)
}
/// MOD [dst_register] [src_register]
i32 MOD_impl(VM* vm, size_t pos){
i32 MOD_impl(VM* vm){
mathOperatorImpl(%)
}