aaron/bfckr
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed bug in optparsing, implemented -e switch, updated Readme and Makefile

Browse Source
This commit is contained in:
id101010
2016-11-16 16:06:26 +01:00
parent 4513d5e1d3
commit 166b63c20d
3 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@@ -7,7 +7,7 @@ HFILES=$(shell find . -name '*.h')
STYLE=astyle --style=1tbs STYLE=astyle --style=1tbs
RUN=valgrind --leak-check=full RUN=valgrind --leak-check=full
DEBUG=gdb --args DEBUG=gdb --args
ARGS="examples/pi.bf" ARGS=-d -f "examples/pi.bf"
all: build all: build

3
README.md
View File

@@ -41,7 +41,8 @@ Memory viewer:
------------------------------------------------------------ ------------------------------------------------------------
~~~~ ~~~~
./bfckr -e "----[---->+<]>++."
A
# Breakpoints # Breakpoints

27
bfckr.c
View File

@@ -7,6 +7,7 @@
*/ */
#include<stdio.h> #include<stdio.h>
#include<string.h>
#include<stdint.h> #include<stdint.h>
#include<stdlib.h> #include<stdlib.h>
#include<errno.h> #include<errno.h>
@@ -15,8 +16,8 @@
#include<unistd.h> #include<unistd.h>
// Defines // Defines
#define MEMORY_SIZE 10000 #define MEMORY_SIZE 1000
#define MAX_INPUT_SIZE 10000 #define MAX_INPUT_SIZE 1000
#define clear() printf("\033[H\033[J") #define clear() printf("\033[H\033[J")
// Struct which holds the brainfuck code, the bandtape and some helpervariables // Struct which holds the brainfuck code, the bandtape and some helpervariables
@@ -109,7 +110,12 @@ void print_memoryviewer(bf_code_t *bf)
// print the adresses beneath the memory cells // print the adresses beneath the memory cells
for(int i=(mp-7); i<(mp+8); i++) { for(int i=(mp-7); i<(mp+8); i++) {
printf("%03d ", ((i<0 || i>MEMORY_SIZE) ? 0 : (mp+i)));
if((i<0) || i>MEMORY_SIZE) {
printf("%03d ", MEMORY_SIZE+i);
} else {
printf("%03d ", i);
}
} }
@@ -145,6 +151,11 @@ void bfuck_execute(bf_code_t *bf)
int loop = 0; int loop = 0;
for(size_t i = bf->ip; bf->code[i] != 0; bf->ip=i++) { // where i is the instruction pointer for(size_t i = bf->ip; bf->code[i] != 0; bf->ip=i++) { // where i is the instruction pointer
if(bf->debug) {
bfuck_debugger(bf);
}
switch(bf->code[i]) { switch(bf->code[i]) {
case '>': case '>':
if(bf->mp >= MEMORY_SIZE) { // prevent overrun if(bf->mp >= MEMORY_SIZE) { // prevent overrun
@@ -225,10 +236,6 @@ void bfuck_execute(bf_code_t *bf)
// Do nothing // Do nothing
break; break;
} }
if(bf->debug) {
bfuck_debugger(bf);
}
} }
} }
@@ -249,7 +256,7 @@ int main(int argc, char* argv[])
} }
// optparsing ahead // optparsing ahead
while((option = getopt(argc, argv, "hdef:")) >= 0) { while((option = getopt(argc, argv, "hde:f:")) >= 0) {
switch(option) { switch(option) {
case 'h': // show help case 'h': // show help
printf("Usage: %s [OPTION] [FILE]\n", argv[0]); printf("Usage: %s [OPTION] [FILE]\n", argv[0]);
@@ -260,8 +267,8 @@ int main(int argc, char* argv[])
exit(EXIT_SUCCESS); exit(EXIT_SUCCESS);
break; break;
case 'e': // read input string case 'e': // read input string
//printf ("Input code: \"%s\"\n", argv[2]); // copy optarg to the code register
sscanf(bf.code, "%s", argv[2]); memcpy(bf.code, optarg, strlen(optarg));
break; break;
case 'f': // file input case 'f': // file input
// try to open file // try to open file