AbleOS/holey-toys
2
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

modularization

Browse source
This commit is contained in:
able 2024-03-08 05:23:47 -06:00
parent 99a385752f
commit 78b9b99ab3
7 changed files with 82 additions and 80 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -1,2 +1,3 @@
hbas
*.hbf
*.hbf
build/*

2
Makefile
View file

@ -5,7 +5,7 @@ CFLAGS = -Wall -Wextra -Wpedantic -std=c17 -O3
.PHONY: clean
hbas: src/hbas.c
${CC} ${CFLAGS} ${CFLAGS_EXTRA} src/hbas.c -o hbas
${CC} ${CFLAGS} ${CFLAGS_EXTRA} src/hbas.c -o build/hbas
example: hbas example.S
./hbas < example.S > example

0
example.S → examples/example.S
View file

2
run.sh
View file

@ -1,2 +1,2 @@
make CC=clang
./hbas < example.S > example.hbf
./build/hbas < examples/example.S > build/example.hbf

41
src/args.c Normal file
View file

@ -0,0 +1,41 @@
typedef struct ArgMeta_s
{
char chr;
uint8_t size;
// This is a bitset of acceptable overflow states,
// where accept signed = 1, accept unsigned = 2.
// 1 -> signed, 2 -> unsigned, 3 -> whatever
uint8_t sign;
uint8_t rel;
} ArgMeta;
const ArgMeta ARGS[] = {
{'R', 1, 2, 0},
{'1', 1, 3, 0},
{'b', 1, 1, 0},
{'B', 1, 2, 0},
{'2', 2, 3, 0},
{'o', 2, 1, 1},
{'h', 2, 1, 0},
{'H', 2, 2, 0},
{'4', 4, 3, 0},
{'w', 4, 1, 0},
{'O', 4, 1, 1},
{'W', 4, 2, 0},
{'8', 8, 3, 0},
{'d', 8, 1, 0},
{'D', 8, 2, 0},
{0},
};
const size_t NARGS = sizeof(ARGS) / sizeof(ARGS[0]);
ArgMeta arg_meta(char arg)
{
for (size_t ii = 0; ii < NARGS; ii += 1)
{
ArgMeta meta = ARGS[ii];
if (meta.chr == arg)
{
return meta;
}
}
return ARGS[NARGS - 1];
}

35
src/bytevec.c Normal file
View file

@ -0,0 +1,35 @@
typedef struct ByteVec_s
{
char *buf;
size_t cap;
size_t len;
} ByteVec;
AsmError ensure_push(ByteVec *vec, size_t el_size, size_t extra)
{
if (vec->len + extra < vec->len)
{
return ErrOutOfMemory;
}
while (vec->len + extra > vec->cap)
{
if ((~(size_t)0) / 2 < vec->cap)
{
return ErrOutOfMemory;
}
vec->cap *= 2;
// multiply overflow
if ((~(size_t)0) / el_size < vec->cap)
{
return ErrOutOfMemory;
}
vec->buf = realloc(vec->buf, el_size * vec->cap);
if (vec->buf == NULL)
{
vec->cap = 0;
return ErrOutOfMemory;
}
}
return 0;
}

79
src/hbas.c
View file

@ -25,6 +25,7 @@ SOFTWARE.
#include <string.h>
#include <stdint.h>
#include "args.c"
#include "op.h"
#include "error.h"
#include "instructions.c"
@ -32,6 +33,7 @@ SOFTWARE.
#include "register.c"
#include "token.c"
#include "einfo.h"
#include "bytevec.c"
void hd(char *data, size_t len)
{
@ -46,83 +48,6 @@ void hd(char *data, size_t len)
printf("\n");
}
typedef struct ArgMeta_s
{
char chr;
uint8_t size;
// This is a bitset of acceptable overflow states,
// where accept signed = 1, accept unsigned = 2.
// 1 -> signed, 2 -> unsigned, 3 -> whatever
uint8_t sign;
uint8_t rel;
} ArgMeta;
const ArgMeta ARGS[] = {
{'R', 1, 2, 0},
{'1', 1, 3, 0},
{'b', 1, 1, 0},
{'B', 1, 2, 0},
{'2', 2, 3, 0},
{'o', 2, 1, 1},
{'h', 2, 1, 0},
{'H', 2, 2, 0},
{'4', 4, 3, 0},
{'w', 4, 1, 0},
{'O', 4, 1, 1},
{'W', 4, 2, 0},
{'8', 8, 3, 0},
{'d', 8, 1, 0},
{'D', 8, 2, 0},
{0},
};
const size_t NARGS = sizeof(ARGS) / sizeof(ARGS[0]);
ArgMeta arg_meta(char arg)
{
for (size_t ii = 0; ii < NARGS; ii += 1)
{
ArgMeta meta = ARGS[ii];
if (meta.chr == arg)
{
return meta;
}
}
return ARGS[NARGS - 1];
}
typedef struct ByteVec_s
{
char *buf;
size_t cap;
size_t len;
} ByteVec;
AsmError ensure_push(ByteVec *vec, size_t el_size, size_t extra)
{
if (vec->len + extra < vec->len)
{
return ErrOutOfMemory;
}
while (vec->len + extra > vec->cap)
{
if ((~(size_t)0) / 2 < vec->cap)
{
return ErrOutOfMemory;
}
vec->cap *= 2;
// multiply overflow
if ((~(size_t)0) / el_size < vec->cap)
{
return ErrOutOfMemory;
}
vec->buf = realloc(vec->buf, el_size * vec->cap);
if (vec->buf == NULL)
{
vec->cap = 0;
return ErrOutOfMemory;
}
}
return 0;
}
#define MIN_SIZE 4096
int slurp(FILE *fd, ByteVec *out)