some changed i have locally

Author: UtoECat

kisscomp.c

@@ -89,8 +89,8 @@ static int finallize_jumppair(struct compstate* x, uint16_t f, uint16_t s) {
 	uint16_t start = f + sizeof(uint16_t) + 1;
 	uint16_t end   = s + sizeof(uint16_t) + 1;
 	// set jump distanations 
-	*(uint16_t*)(x->bytecode + f + 1) = end;
-	*(uint16_t*)(x->bytecode + s + 1) = start;
+	*(uint16_t*)(x->bytecode + f + 1) = end - start + 2;
+	*(uint16_t*)(x->bytecode + s + 1) = start - end + 2;
 
 	// do some optimisations
 	loopoptimisation(x, f, s);
@@ -175,7 +175,7 @@ static void newcode(struct compstate* x, enum bytecode n) {
 }
 
 /*
- * Compilation functions :p
+ * Compilation function :p
  */
 int loadcode(struct kissfuck* kf, const char* filename) {
 	if (kf == ERR_ERR) return ERR_ERR;

kissdbg.c

@@ -60,8 +60,8 @@ void printbytecode (struct kissfuck* x, int i, int arg) {
 		int val = *(uint16_t*)(x->bytecode + i + 1);
 		fprintf(stderr, " %05i | ", val);
 	} else if (arg == 3) { // JPZ and JPNZ
-		get_label(i + 3); // save next instruction as  
-		int val = *(uint16_t*)(x->bytecode + i + 1);
+		get_label(i + 3); // save next instruction position
+		int val = (uint16_t)i + *(uint16_t*)(x->bytecode + i + 1);
 		val = get_label(val);
 		if (val < 0) fprintf(stderr, "  ???  | ");
 		else fprintf(stderr, " L%03i  | ", val);

kissfuck.h

@@ -93,7 +93,7 @@ struct kissfuck {
 };
 
 struct kissfuck* makectx();
-int  loadcode(struct kissfuck*, const char* filename);
+int  loadcode(struct kissfuck* restrict const, const char* filename);
 int  execcode(struct kissfuck*);
 void stopcode(struct kissfuck*);
 int  dumpcode(struct kissfuck*);

kissvm.c

@@ -30,18 +30,18 @@ static void handler(int) {
 }
 
 #define cell()  (x->array[SP])
-#define reads() ((uint8_t)x->bytecode[IP])
-#define readl() *(uint16_t*)(x->bytecode + (IP))
+#define reads() ((uint8_t)BC[IP])
+#define readl() *(uint16_t*)(BC + (IP))
 
-int execcode (struct kissfuck* const x) {
+int execcode (struct kissfuck* restrict const x) {
 	signal(SIGINT, handler);
 
-	int     works = 1;
 	register uint16_t IP  = x->instp;
 	register uint16_t SP  = x->cellp;
+	register const uint8_t *BC = x->bytecode;
 	has_signal   = 0;
 
-	while (works) {
+	while (BC) {
 		if (unlikely(has_signal)) {
 			fprintf(stderr, "\n[vm] : INTERRUPTED!\n");
 			break;
@@ -50,7 +50,7 @@ int execcode (struct kissfuck* const x) {
 		IP++;
 		switch (C) {
 		case BC_HALT:
-			fflush(stdout); works = 0; IP--;
+			fflush(stdout); BC = NULL; IP--;
 		break;
 		case BC_SET :
 			cell() = reads();
@@ -62,33 +62,39 @@ int execcode (struct kissfuck* const x) {
 		break;
 		case BC_IN  :
 			// ignore other characters
-			for (int i = 0; i < (reads() - 1); i++) getchar();
+			uint8_t m = reads();
+			for (int i = 0; i < (m - 1); i++) getchar();
 			cell() = getchar();
 			IP++;
 		break;
 		case BC_OUT :
-			for (int i = 0; i < reads(); i++) putchar(cell());
+			m = reads();
+			for (int i = 0; i < m; i++) putchar(cell());
 			IP++;
 		break;
 		case BC_NEXT:
 			SP += readl();
 			IP += 2;
 		break;
 		case BC_JPZ :
-			if (!cell()) IP = readl();
+			if (!cell()) IP += readl();
 			else IP += 2; // skip readed value only if we skips jump
 		break;
 		case BC_JPNZ:
-			if (cell())  IP = readl();
+			if (cell())  IP += readl();
 			else IP += 2; // skip readed value only if we skips jump
 		break;
-		case BC_NUNZ:
-			while (cell()) SP += readl();
+		case BC_NUNZ: {
+			uint16_t cnt = readl();
+			while (cell()) SP += cnt;
 			IP += 2;
+		}
 		break;
 		default :
 			// you will never get here!
 			unreachable();
+			//fprintf(stderr, "BAD INSTRUCTION! pos = 0x%05X\n", IP);
+			//return ERR_ERR;
 		break;
 		};
 	};

makefile

@@ -13,9 +13,9 @@ OBJS := $(SRCS:%=$(BUILD_DIR)/%.o)
 DEPS := $(OBJS:.o=.d)
 INC_FLAGS := -I.
 #forming compiler flags
-UNIFLAGS ?= -O3 -Wall -Wextra -flto
+UNIFLAGS ?= -O3 -Wall -Wextra -flto -g
 LINFLAGS ?= 
-CMPFLAGS ?= $(INC_FLAGS) -MMD -MP $(UNIFLAGS) -std=gnu2x -fanalyzer
+CMPFLAGS ?= $(INC_FLAGS) -MMD -MP $(UNIFLAGS) -std=gnu2x
 
 #libraries, that we need to link
 LDLIBS := -lm

test.bfk

@@ -0,0 +1,4 @@
+++++++++
+[>+++++++++++++>++++<<-]>.
+---. +++++++. . +++. >.
+<++++++++. --------. +++. ------. --------.