projects
/
vvhitespace
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
tags
|
clone url
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added ASCII string capability to `vvc`.
[vvhitespace]
/
vv_interpreter.c
diff --git
a/vv_interpreter.c
b/vv_interpreter.c
index
ca2f772
..
1d5d906
100644
(file)
--- a/
vv_interpreter.c
+++ b/
vv_interpreter.c
@@
-15,9
+15,9
@@
#define VERSION 1
#define VERSION 1
-#define
STACKSIZE 1024
-#define
HEAPSIZE 1024
-#define RETURNSTACKSIZE 1024
+#define
HEAPSIZE 1024 /* Size of heap in words */
+#define
DATASTACKSIZE 1024 /* Size of stack in words */
+#define RETURNSTACKSIZE 1024
/* Max subroutine call depth */
void
print_usage(char ** argv)
void
print_usage(char ** argv)
@@
-83,19
+83,19
@@
ws_die(size_t * pc, char * msg)
}
void
}
void
-stack_push(int
32_t ** sp, int32
_t word)
+stack_push(int
64_t ** sp, int64
_t word)
{
*((*sp)++) = word;
}
{
*((*sp)++) = word;
}
-int
32
_t
-stack_pop(int
32
_t ** sp)
+int
64
_t
+stack_pop(int
64
_t ** sp)
{
return *(--(*sp));
}
{
return *(--(*sp));
}
-int
32
_t
-stack_peek(int
32
_t ** sp, size_t offset)
+int
64
_t
+stack_peek(int
64
_t ** sp, size_t offset)
/* offset=0 peeks TOS, offset=1 peeks NOS, etc. */
{
return *((*sp)-offset-1);
/* offset=0 peeks TOS, offset=1 peeks NOS, etc. */
{
return *((*sp)-offset-1);
@@
-118,35
+118,39
@@
parse_label(uint8_t * code, size_t * pc)
uint8_t c;
while ((c = code[(*pc)++]) != '\n') {
label = label << 1;
uint8_t c;
while ((c = code[(*pc)++]) != '\n') {
label = label << 1;
- if (c == '
') label++;
+ if (c == '
\t
') label++;
}
}
- // TODO: Where should I handle attempts to access an unitialized label?
- // For now, leave it undefined in a nasal demon sense.
+ return label;
+}
+
+uint16_t
+check_label(size_t * labels, uint16_t label, size_t * pc)
+{
+ if(!labels[label]) ws_die(pc, "uninitialized label (forgot an include?)");
return label;
}
void
return label;
}
void
-populate_labels(
uint32
_t * labels, uint8_t * code, size_t code_size)
+populate_labels(
size
_t * labels, uint8_t * code, size_t code_size)
{
size_t cp = 0;
while (cp <= code_size) {
{
size_t cp = 0;
while (cp <= code_size) {
- if (code[cp] == '\v') {
+ if (code[cp
++
] == '\v') {
uint16_t temp_label = parse_label(code, &cp);
labels[temp_label] = cp;
}
uint16_t temp_label = parse_label(code, &cp);
labels[temp_label] = cp;
}
- cp++;
}
}
void
}
}
void
-process_imp_stack(uint8_t * code, size_t * pc, int
32
_t ** sp)
+process_imp_stack(uint8_t * code, size_t * pc, int
64
_t ** sp)
{
switch (next_code_byte(code,pc)) {
case ' ':
/* Push number onto TOS. */
{
/* First, pick off the sign */
{
switch (next_code_byte(code,pc)) {
case ' ':
/* Push number onto TOS. */
{
/* First, pick off the sign */
- int
32
_t sign = 0;
+ int
64
_t sign = 0;
switch (next_code_byte(code,pc)) {
case ' ' : sign = 1; break;
case '\t': sign = -1; break;
switch (next_code_byte(code,pc)) {
case ' ' : sign = 1; break;
case '\t': sign = -1; break;
@@
-155,7
+159,8
@@
process_imp_stack(uint8_t * code, size_t * pc, int32_t ** sp)
/* Now, construct the number and push to TOS. */
/* I'm assuming the numbers are read MSb first. */
/* Now, construct the number and push to TOS. */
/* I'm assuming the numbers are read MSb first. */
- int32_t temp, number = 0;
+ int64_t number = 0;
+ uint8_t temp;
while ((temp = next_code_byte(code,pc)) != '\n') {
if (temp == '\v') ws_die(pc, "non-binary digit in number");
number <<= 1;
while ((temp = next_code_byte(code,pc)) != '\n') {
if (temp == '\v') ws_die(pc, "non-binary digit in number");
number <<= 1;
@@
-175,8
+180,8
@@
process_imp_stack(uint8_t * code, size_t * pc, int32_t ** sp)
/* Swap TOS and NOS. */
case '\t':
{
/* Swap TOS and NOS. */
case '\t':
{
- int
32
_t t1 = stack_pop(sp);
- int
32
_t t2 = stack_pop(sp);
+ int
64
_t t1 = stack_pop(sp);
+ int
64
_t t2 = stack_pop(sp);
stack_push(sp, t1);
stack_push(sp, t2);
}
stack_push(sp, t1);
stack_push(sp, t2);
}
@@
-196,9
+201,9
@@
process_imp_stack(uint8_t * code, size_t * pc, int32_t ** sp)
}
void
}
void
-process_imp_arithmetic(uint8_t * code, size_t * pc, int
32
_t ** sp)
+process_imp_arithmetic(uint8_t * code, size_t * pc, int
64
_t ** sp)
{
{
- int
32
_t temp;
+ int
64
_t temp;
switch (next_code_byte(code,pc)) {
case ' ':
{
switch (next_code_byte(code,pc)) {
case ' ':
{
@@
-244,9
+249,10
@@
process_imp_arithmetic(uint8_t * code, size_t * pc, int32_t ** sp)
}
void
}
void
-process_imp_flowcontrol(uint8_t * code, size_t * pc, int
32_t ** sp, uint32
_t * labels,
-
uint32
_t ** rsp)
+process_imp_flowcontrol(uint8_t * code, size_t * pc, int
64_t ** sp, size
_t * labels,
+
size
_t ** rsp)
{
{
+ size_t temp_pc;
switch (next_code_byte(code,pc)) {
case '\n':
/* Technically another LF is required but we ignore it. */
switch (next_code_byte(code,pc)) {
case '\n':
/* Technically another LF is required but we ignore it. */
@@
-265,15
+271,13
@@
process_imp_flowcontrol(uint8_t * code, size_t * pc, int32_t ** sp, uint32_t * l
break;
case '\t':
/* Call a subroutine. */
break;
case '\t':
/* Call a subroutine. */
- {
- size_t temp_pc = labels[parse_label(code, pc)];
- *((*rsp)++) = *pc;
- *pc = temp_pc;
- }
+ temp_pc = labels[check_label(labels, parse_label(code, pc), pc)];
+ *((*rsp)++) = *pc;
+ *pc = temp_pc;
break;
case '\n':
/* Jump unconditionally to a label. */
break;
case '\n':
/* Jump unconditionally to a label. */
- *pc = labels[
parse_label(code
, pc)];
+ *pc = labels[
check_label(labels, parse_label(code, pc)
, pc)];
break;
default:
ws_die(pc, "malformed flow control IMP");
break;
default:
ws_die(pc, "malformed flow control IMP");
@@
-286,13
+290,13
@@
process_imp_flowcontrol(uint8_t * code, size_t * pc, int32_t ** sp, uint32_t * l
switch (next_code_byte(code,pc)) {
case ' ':
/* Jump to a label if TOS == 0 */
switch (next_code_byte(code,pc)) {
case ' ':
/* Jump to a label if TOS == 0 */
- /* TODO: Does WS pop or peek the TOS? */
- if (stack_p
eek(sp,0) == 0) *pc = labels[parse_label(code, pc)]
;
+ temp_pc = labels[check_label(labels, parse_label(code, pc), pc)];
+ if (stack_p
op(sp) == 0) *pc = temp_pc
;
break;
case '\t':
/* Jump to a label if TOS < 0. */
break;
case '\t':
/* Jump to a label if TOS < 0. */
- /* TODO: Does WS pop or peek the TOS? */
- if (stack_p
eek(sp,0) < 0) *pc = labels[parse_label(code, pc)]
;
+ temp_pc = labels[check_label(labels, parse_label(code, pc), pc)];
+ if (stack_p
op(sp) < 0) *pc = temp_pc
;
break;
case '\n':
/* Return from subroutine. */
break;
case '\n':
/* Return from subroutine. */
@@
-311,14
+315,14
@@
process_imp_flowcontrol(uint8_t * code, size_t * pc, int32_t ** sp, uint32_t * l
}
void
}
void
-process_imp_heap(uint8_t * code, size_t * pc, int
32_t ** sp, int32
_t ** hp)
+process_imp_heap(uint8_t * code, size_t * pc, int
64_t ** sp, int64
_t ** hp)
{
switch (next_code_byte(code,pc)) {
case ' ' :
/* Store to heap */
{
{
switch (next_code_byte(code,pc)) {
case ' ' :
/* Store to heap */
{
- int
32
_t value = stack_pop(sp);
- int
32_t addr
= stack_pop(sp);
+ int
64
_t value = stack_pop(sp);
+ int
64_t addr
= stack_pop(sp);
*(*hp + addr) = value;
}
break;
*(*hp + addr) = value;
}
break;
@@
-333,15
+337,15
@@
process_imp_heap(uint8_t * code, size_t * pc, int32_t ** sp, int32_t ** hp)
}
void
}
void
-process_imp_io(uint8_t * code, size_t * pc, int
32_t ** sp, int32
_t ** hp)
+process_imp_io(uint8_t * code, size_t * pc, int
64_t ** sp, int64
_t ** hp)
{
switch (next_code_byte(code,pc)) {
case ' ':
/* Output */
{
switch (next_code_byte(code,pc)) {
{
switch (next_code_byte(code,pc)) {
case ' ':
/* Output */
{
switch (next_code_byte(code,pc)) {
- case ' ' : /* Output char from TOS */ printf("%c", stack_pop(sp)); break;
- case '\t': /* Output digit from TOS */ printf("%c", stack_pop(sp)+'0'); break;
+ case ' ' : /* Output char from TOS */ printf("%c",
(uint8_t)
stack_pop(sp)); break;
+ case '\t': /* Output digit from TOS */ printf("%c",
(uint8_t)
stack_pop(sp)+'0'); break;
default : ws_die(pc, "malformed output IMP"); break;
}
fflush(stdout);
default : ws_die(pc, "malformed output IMP"); break;
}
fflush(stdout);
@@
-393,7
+397,7
@@
main(int argc, char ** argv)
}
/*
}
/*
- * Read just the VVhitespace source code into memory.
+ * Read just the VVhitespace source code into memory
, stripping comment characters
.
* We will use the array indices as addresses for the virtual PC when jumping to labels.
*/
size_t ws_code_size = 0;
* We will use the array indices as addresses for the virtual PC when jumping to labels.
*/
size_t ws_code_size = 0;
@@
-415,17
+419,16
@@
main(int argc, char ** argv)
/*
* Setup a stack and heap.
/*
* Setup a stack and heap.
- * Assume a 32-bit word size.
*/
*/
- // TODO: Make everything 64-bit.
- int32_t * hp = malloc(HEAPSIZE*4);
- int32_t * sp = malloc(STACKSIZE*4);
+ int64_t * hp = malloc(HEAPSIZE*sizeof(int64_t));
+ int64_t * sp = malloc(DATASTACKSIZE*sizeof(int64_t));
/*
* Setup the return stack and the label array.
*/
/*
* Setup the return stack and the label array.
*/
- uint32_t * rsp = malloc(RETURNSTACKSIZE*4);
- uint32_t labels[65536] = {0};
+ size_t * rsp = malloc(RETURNSTACKSIZE*sizeof(size_t));
+ size_t labels[65536] = {0}; /* 65536 = 2^16 => Holds all possible labels. */
+ /* Default value of zero indicates an uninitialized label. */
populate_labels(labels, ws_code_space, ws_code_size);
/*
populate_labels(labels, ws_code_space, ws_code_size);
/*
@@
-440,8
+443,6
@@
main(int argc, char ** argv)
exit(EXIT_FAILURE);
unset_terminal_mode();
}
exit(EXIT_FAILURE);
unset_terminal_mode();
}
-// TODO: Have the SIGTERM signal handler and normal term point return the value
-// on TOS so I can do rudimentary automated tests.
/* Decode the IMPs */
switch (ws_code_space[pc++]) {
/* Decode the IMPs */
switch (ws_code_space[pc++]) {
@@
-472,13
+473,7
@@
main(int argc, char ** argv)
}
}
break;
}
}
break;
- default: ws_die(&pc, "unexpected
VTab
"); break;
+ default: ws_die(&pc, "unexpected
byte
"); break;
}
}
}
}
-
- printf("\n");
- printf("Program executed.\n");
-
- exit(EXIT_SUCCESS);
- unset_terminal_mode();
}
}