Made naming conventions more consistent.
This commit is contained in:
parent
d270cc5706
commit
ed3acfd515
8 changed files with 23 additions and 23 deletions
|
|
@ -18,8 +18,8 @@ typedef struct tvm_htab_s
|
|||
tvm_htable_node_t **nodes;
|
||||
} tvm_htab_t;
|
||||
|
||||
tvm_htab_t* create_htab();
|
||||
void destroy_htab(tvm_htab_t *htab);
|
||||
tvm_htab_t* htab_create();
|
||||
void htab_destroy(tvm_htab_t *htab);
|
||||
|
||||
int htab_add(tvm_htab_t *htab, const char *key, int value);
|
||||
int htab_find(tvm_htab_t *htab, const char *key);
|
||||
|
|
|
|||
|
|
@ -38,7 +38,7 @@ typedef struct
|
|||
tvm_register_t *registers;
|
||||
} tvm_memory_t;
|
||||
|
||||
tvm_memory_t *create_memory(size_t size);
|
||||
void destroy_memory(tvm_memory_t *mem);
|
||||
tvm_memory_t *memory_create(size_t size);
|
||||
void memory_destroy(tvm_memory_t *mem);
|
||||
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -25,12 +25,12 @@ typedef struct tvm_program_s
|
|||
} tvm_program_t;
|
||||
|
||||
/* Create and initialize an empty program object */
|
||||
tvm_program_t *create_program();
|
||||
tvm_program_t *program_create();
|
||||
|
||||
/* Interpret a source file into bytecode, and store it in a program object */
|
||||
int interpret_program(tvm_program_t *p, char *filename, tvm_memory_t *pMemory);
|
||||
int program_interpret(tvm_program_t *p, char *filename, tvm_memory_t *pMemory);
|
||||
|
||||
void destroy_program(tvm_program_t *p);
|
||||
void program_destroy(tvm_program_t *p);
|
||||
|
||||
int *tvm_add_value(tvm_program_t *p, const int val);
|
||||
int tvm_parse_value(const char *str);
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
/* Initialize our stack by setting the base pointer and stack pointer */
|
||||
|
||||
inline void create_stack(tvm_memory_t *mem, size_t size)
|
||||
inline void stack_create(tvm_memory_t *mem, size_t size)
|
||||
{
|
||||
mem->registers[0x7].i32_ptr = ((int32_t *)mem->mem_space) + (size / sizeof(int32_t));
|
||||
mem->registers[0x6].i32_ptr = mem->registers[0x7].i32_ptr;
|
||||
|
|
|
|||
12
libtvm/tvm.c
12
libtvm/tvm.c
|
|
@ -4,10 +4,10 @@ tvm_t *tvm_create(char *filename)
|
|||
{
|
||||
tvm_t *vm = (tvm_t*)malloc(sizeof(tvm_t));
|
||||
|
||||
vm->pMemory = create_memory(MIN_MEMORY_SIZE);
|
||||
vm->pProgram = create_program();
|
||||
vm->pMemory = memory_create(MIN_MEMORY_SIZE);
|
||||
vm->pProgram = program_create();
|
||||
|
||||
create_stack(vm->pMemory, MIN_STACK_SIZE);
|
||||
stack_create(vm->pMemory, MIN_STACK_SIZE);
|
||||
|
||||
if(!vm || !vm->pMemory || !vm->pProgram) return NULL;
|
||||
|
||||
|
|
@ -16,14 +16,14 @@ tvm_t *tvm_create(char *filename)
|
|||
|
||||
int tvm_interpret(tvm_t *vm, char *filename)
|
||||
{
|
||||
if(interpret_program(vm->pProgram, filename, vm->pMemory) != 0) return 1;
|
||||
if(program_interpret(vm->pProgram, filename, vm->pMemory) != 0) return 1;
|
||||
return 0;
|
||||
}
|
||||
|
||||
void tvm_destroy(tvm_t *vm)
|
||||
{
|
||||
if(vm && vm->pMemory)destroy_memory(vm->pMemory);
|
||||
if(vm && vm->pProgram)destroy_program(vm->pProgram);
|
||||
if(vm && vm->pMemory) memory_destroy(vm->pMemory);
|
||||
if(vm && vm->pProgram) program_destroy(vm->pProgram);
|
||||
if(vm) free(vm);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
#include <tvm/tvm_hashtab.h>
|
||||
|
||||
tvm_htab_t *create_htab()
|
||||
tvm_htab_t *htab_create()
|
||||
{
|
||||
tvm_htab_t *htab = (tvm_htab_t *)malloc(sizeof(tvm_htab_t));
|
||||
htab->size = HTAB_SIZE;
|
||||
|
|
@ -12,7 +12,7 @@ tvm_htab_t *create_htab()
|
|||
return htab;
|
||||
}
|
||||
|
||||
void destroy_htab(tvm_htab_t *htab)
|
||||
void htab_destroy(tvm_htab_t *htab)
|
||||
{
|
||||
int i;
|
||||
tvm_htable_node_t *node, *next;
|
||||
|
|
|
|||
|
|
@ -5,7 +5,7 @@
|
|||
|
||||
#define NUM_REGISTERS 17
|
||||
|
||||
tvm_memory_t *create_memory(size_t size)
|
||||
tvm_memory_t *memory_create(size_t size)
|
||||
{
|
||||
tvm_memory_t *m = (tvm_memory_t *)calloc(1, sizeof(tvm_memory_t));
|
||||
|
||||
|
|
@ -17,7 +17,7 @@ tvm_memory_t *create_memory(size_t size)
|
|||
return m;
|
||||
}
|
||||
|
||||
void destroy_memory(tvm_memory_t *m)
|
||||
void memory_destroy(tvm_memory_t *m)
|
||||
{
|
||||
free(m->mem_space);
|
||||
free(m->registers);
|
||||
|
|
|
|||
|
|
@ -13,18 +13,18 @@ static int parse_instructions(tvm_program_t *p, const char ***tokens, tvm_memory
|
|||
static int *token_to_register(const char *token, tvm_memory_t *pMemory);
|
||||
static int instr_to_opcode(const char *instr);
|
||||
|
||||
tvm_program_t *create_program()
|
||||
tvm_program_t *program_create()
|
||||
{
|
||||
tvm_program_t *p = (tvm_program_t *)calloc(1, sizeof(tvm_program_t));
|
||||
p->label_htab = create_htab();
|
||||
p->label_htab = htab_create();
|
||||
|
||||
return p;
|
||||
}
|
||||
|
||||
void destroy_program(tvm_program_t *p)
|
||||
void program_destroy(tvm_program_t *p)
|
||||
{
|
||||
int i = 0;
|
||||
destroy_htab(p->label_htab);
|
||||
htab_destroy(p->label_htab);
|
||||
|
||||
if(p->values)
|
||||
{
|
||||
|
|
@ -42,7 +42,7 @@ void destroy_program(tvm_program_t *p)
|
|||
free(p);
|
||||
}
|
||||
|
||||
int interpret_program(tvm_program_t *p, char *filename, tvm_memory_t *pMemory)
|
||||
int program_interpret(tvm_program_t *p, char *filename, tvm_memory_t *pMemory)
|
||||
{
|
||||
int i;
|
||||
FILE *pFile = NULL;
|
||||
|
|
|
|||
Loading…
Reference in a new issue