CPunch/Cosmo
1
0
Fork 0
mirror of https://github.com/CPunch/Cosmo.git synced 2024-11-22 07:20:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

formatting changes

Browse Source
This commit is contained in:
CPunch 2023-05-28 00:03:50 -05:00
parent 54a959438b
commit 89d443d767
3 changed files with 37 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cdump.c
View File

@ -1,9 +1,9 @@
#include "cdump.h" #include "cdump.h"
#include "cdebug.h"
#include "cmem.h" #include "cmem.h"
#include "cobj.h" #include "cobj.h"
#include "cvalue.h" #include "cvalue.h"
#include "cdebug.h"
typedef struct typedef struct
{ {

62
src/cundump.c
View File

@ -1,8 +1,9 @@
#include "cdump.h"
#include "cundump.h" #include "cundump.h"
#include "cvm.h"
#include "cchunk.h" #include "cchunk.h"
#include "cdump.h"
#include "cmem.h" #include "cmem.h"
#include "cvm.h"
typedef struct typedef struct
{ {
@ -14,10 +15,11 @@ typedef struct
static bool readCValue(UndumpState *udstate, CValue *val); static bool readCValue(UndumpState *udstate, CValue *val);
#define check(e) if (!e) { \ #define check(e) \
printf("FAILED %d\n", __LINE__); \ if (!e) { \
return false; \ printf("FAILED %d\n", __LINE__); \
} return false; \
}
static void initUndumpState(CState *state, UndumpState *udstate, cosmo_Reader reader, static void initUndumpState(CState *state, UndumpState *udstate, cosmo_Reader reader,
const void *userData) const void *userData)
@ -55,18 +57,19 @@ static bool readSize(UndumpState *udstate, size_t *d)
static bool readVector(UndumpState *udstate, void **data, size_t size, size_t *count) static bool readVector(UndumpState *udstate, void **data, size_t size, size_t *count)
{ {
check(readSize(udstate, count)); check(readSize(udstate, count));
*data = cosmoM_xmalloc(udstate->state, (*count)*size); *data = cosmoM_xmalloc(udstate->state, (*count) * size);
return readBlock(udstate, *data, (*count)*size); return readBlock(udstate, *data, (*count) * size);
} }
#define checku8(udstate, d, tmp) \ #define checku8(udstate, d, tmp) \
check(readu8(udstate, &tmp)); \ check(readu8(udstate, &tmp)); \
if (d != tmp) { \ if (d != tmp) { \
cosmoV_error(udstate->state, "bad header!"); \ cosmoV_error(udstate->state, "bad header!"); \
return false; \ return false; \
} }
static bool checkHeader(UndumpState *udstate) { static bool checkHeader(UndumpState *udstate)
{
char magic[COSMO_MAGIC_LEN]; char magic[COSMO_MAGIC_LEN];
uint8_t tmp; uint8_t tmp;
@ -99,7 +102,7 @@ static bool readCObjString(UndumpState *udstate, CObjString **str)
return true; return true;
} }
data = cosmoM_xmalloc(udstate->state, size+1); data = cosmoM_xmalloc(udstate->state, size + 1);
check(readBlock(udstate, (void *)data, size)); check(readBlock(udstate, (void *)data, size));
data[size] = '\0'; /* add NULL-terminator */ data[size] = '\0'; /* add NULL-terminator */
@ -107,7 +110,8 @@ static bool readCObjString(UndumpState *udstate, CObjString **str)
return true; return true;
} }
static bool readCObjFunction(UndumpState *udstate, CObjFunction **func) { static bool readCObjFunction(UndumpState *udstate, CObjFunction **func)
{
*func = cosmoO_newFunction(udstate->state); *func = cosmoO_newFunction(udstate->state);
check(readCObjString(udstate, &(*func)->name)); check(readCObjString(udstate, &(*func)->name));
@ -118,8 +122,10 @@ static bool readCObjFunction(UndumpState *udstate, CObjFunction **func) {
check(readu8(udstate, (uint8_t *)&(*func)->variadic)); check(readu8(udstate, (uint8_t *)&(*func)->variadic));
/* read chunk info */ /* read chunk info */
check(readVector(udstate, (void **)&(*func)->chunk.buf, sizeof(uint8_t), &(*func)->chunk.count)); check(
check(readVector(udstate, (void **)&(*func)->chunk.lineInfo, sizeof(int), &(*func)->chunk.count)); readVector(udstate, (void **)&(*func)->chunk.buf, sizeof(uint8_t), &(*func)->chunk.count));
check(
readVector(udstate, (void **)&(*func)->chunk.lineInfo, sizeof(int), &(*func)->chunk.count));
/* read constants */ /* read constants */
size_t constants; size_t constants;
@ -127,8 +133,6 @@ static bool readCObjFunction(UndumpState *udstate, CObjFunction **func) {
for (int i = 0; i < constants; i++) { for (int i = 0; i < constants; i++) {
CValue val; CValue val;
check(readCValue(udstate, &val)); check(readCValue(udstate, &val));
// printValue(val);
// putc('\n', stdout);
addConstant(udstate->state, &(*func)->chunk, val); addConstant(udstate->state, &(*func)->chunk, val);
} }
@ -153,15 +157,16 @@ static bool readCObj(UndumpState *udstate, CObj **obj)
return true; return true;
} }
#define READ_VAR(udstate, val, type, creator) \ #define READ_VAR(udstate, val, type, creator) \
{ \ { \
type _tmp; \ type _tmp; \
check(readBlock(udstate, &_tmp, sizeof(type))); \ check(readBlock(udstate, &_tmp, sizeof(type))); \
*val = creator(_tmp); \ *val = creator(_tmp); \
break; \ break; \
} }
static bool readCValue(UndumpState *udstate, CValue *val) { static bool readCValue(UndumpState *udstate, CValue *val)
{
uint8_t type; uint8_t type;
check(readu8(udstate, &type)); check(readu8(udstate, &type));
@ -186,7 +191,8 @@ static bool readCValue(UndumpState *udstate, CValue *val) {
return true; return true;
} }
int cosmoD_undump(CState *state, cosmo_Reader reader, const void *userData, CObjFunction **func) { int cosmoD_undump(CState *state, cosmo_Reader reader, const void *userData, CObjFunction **func)
{
UndumpState udstate; UndumpState udstate;
initUndumpState(state, &udstate, reader, userData); initUndumpState(state, &udstate, reader, userData);

3
src/cvm.c
View File

@ -31,7 +31,8 @@ COSMO_API void cosmo_insert(CState *state, int indx, CValue val)
state->top++; state->top++;
} }
COSMO_API bool cosmoV_undump(CState *state, cosmo_Reader reader, const void *ud) { COSMO_API bool cosmoV_undump(CState *state, cosmo_Reader reader, const void *ud)
{
CObjFunction *func; CObjFunction *func;
if (cosmoD_undump(state, reader, ud, &func)) { if (cosmoD_undump(state, reader, ud, &func)) {