getting ready for VCF!

emu/Makefile

@@ -1,22 +1,26 @@
-SRC=emu.c apr.c mem.c tty.c pt.c dc.c dt.c dis340.c netmem.c cmd.c util.c threading.c rtc.c ../tools/pdp6common.c
+SRC=emu.c apr.c mem.c tty.c pt.c dc.c dt.c netmem.c cmd.c util.c threading.c rtc.c ../tools/pdp6common.c
 H=pdp6.h ../tools/pdp6common.h threading.h
 # clang
 #CFLAGS= -Wno-shift-op-parentheses -Wno-logical-op-parentheses \
 #        -Wno-bitwise-op-parentheses
 CFLAGS=  -O3 -Wall -Wno-parentheses -fno-diagnostics-show-caret
 #CFLAGS=  -g -Wall -Wno-parentheses -fno-diagnostics-show-caret
-SDLFLAGS=`sdl2-config --cflags` `pkg-config SDL2_image --cflags`
+SDLFLAGS=`sdl2-config --cflags` `pkg-config SDL2_image --cflags` -DGRAPHICS
 
-LIBS=`sdl2-config --libs` `pkg-config SDL2_image --libs` -lpthread -lm
+LIBS=-lpthread -lm
+SDLLIBS=`sdl2-config --libs` `pkg-config SDL2_image --libs`
 
 
-pdp6: main_panel.c $(SRC) $(H)
-	$(CC) -o $@ $(CFLAGS) $(SDLFLAGS) main_panel.c $(SRC) $(LIBS)
+pdp6: main_panel.c dis340.c $(SRC) $(H)
+	$(CC) -o $@ $(CFLAGS) $(SDLFLAGS) main_panel.c dis340.c $(SRC) $(LIBS) $(SDLLIBS)
 pdp6_s: main_serial.c $(SRC) $(H)
-	$(CC) -o $@ $(CFLAGS) $(SDLFLAGS) main_serial.c $(SRC) $(LIBS)
+	$(CC) -o $@ $(CFLAGS) main_serial.c $(SRC) $(LIBS)
 
 test_dc: test_dc.c dc.c $(H)
 	$(CC) -o $@ $(CFLAGS) test_dc.c dc.c
 
 test_dt: test_dt.c dc.c dt.c $(H)
 	$(CC) -o $@ $(CFLAGS) test_dt.c dc.c dt.c
+
+test_apr: test_apr.c main_panel.c dis340.c $(SRC) $(H)
+	$(CC) -o $@ $(CFLAGS) $(SDLFLAGS) test_apr.c main_panel.c dis340.c $(SRC) $(LIBS) $(SDLLIBS)

emu/apr.c

@@ -3428,7 +3428,7 @@ aprstart(Apr *apr)
 	static RtcMsg lineclk = { 1, 1, nil, 1000000000/60 };
 
 	int i;
-	printf("[aprstart]\n");
+//	printf("[aprstart]\n");
 
 	apr->pfree = nil;
 	apr->pulse = nil;
@@ -3581,6 +3581,21 @@ if(!apr->run){
 		apr->ia_inh = 0;
 }
 
+void
+apr_testinst(Apr *apr)
+{
+	apr->sw_power = 0;
+	aprcycle(apr);
+	apr->sw_power = 1;
+	aprcycle(apr);
+
+	while(apr->pulse)
+		aprcycle(apr);
+	apr->pc = 020;
+	pulse(apr, &it0, 1);
+	while(apr->pulse)
+		aprcycle(apr);
+}
 
 
 

emu/cmd.c

@@ -233,7 +233,9 @@ DevDef definitions[] = {
 	{ DC_IDENT, makedc },
 	{ DT_IDENT, makedt },
 	{ DX_IDENT, makedx },
+#ifdef GRAPHICS
 	{ DIS_IDENT, makedis },
+#endif
 	{ NETMEM_IDENT, makenetmem },
 	{ nil, nil }
 };

emu/dis340.c

@@ -482,6 +482,7 @@ data_sync(Dis340 *dis)
 
 	// LOAD BR
 	dis->br |= dis->ib>>18 & RT;
+//printf("DIS: %06o\n", dis->br);
 
 	dis->pnts = dis->br;
 	dis->chrs = dis->br;

emu/dt.c

@@ -329,6 +329,7 @@ setstat(Dt551 *dt, int state)
 static void
 dtsetgo(Dt551 *dt, int go)
 {
+/*
 	printf("setting GO %d %d\n", dt->ut_go, go);
 	if(dt->ut_go != go){
 		if(go)
@@ -336,6 +337,7 @@ dtsetgo(Dt551 *dt, int go)
 		else
 			printf("DECtape stopped\n\n\n");
 	}
+*/
 	dt->ut_go = go;
 }
 

emu/init.ini

@@ -43,6 +43,6 @@ mount ptr ../code/ptp.out
 #mount dx1 ../test/out.dt6
 #mount dx1 ../test/test.dt6
 mount dx1 ../files/sys6.dtr
-mount dx2 ../test/foo.dtr
+mount dx2 ../test/spcwar.dtr
 
 #load -b ../maint/pdp6.part1

emu/main_panel.c

@@ -857,6 +857,9 @@ threadmain(int argc, char *argv[])
 		exit(1);
 	}
 
+void test_apr(void);
+//test_apr();
+
 	SDL_Init(SDL_INIT_EVERYTHING);
 	IMG_Init(IMG_INIT_PNG);
 

emu/mem.c

@@ -171,7 +171,7 @@ powercore(Mem *mem)
 {
 	CMem *core;
 
-	printf("[powercore]\n");
+//	printf("[powercore]\n");
 	core = mem->module;
 	readmem(core->filename, core->core, core->size);
 	core->cmc_aw_rq = 1;
@@ -237,7 +237,7 @@ powerff(Mem *mem)
 {
 	FMem *ff;
 
-	printf("[powerff]\n");
+//	printf("[powerff]\n");
 	ff = mem->module;
 	ff->fmc_act = 0;
 	ff->fmc_wr = 0;