folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

DISPLAY: clean up test programs, makefiles, remove old xy.c

Browse source
This commit is contained in:
Phil Budne 2018-02-17 20:11:56 -05:00
parent b11fbf6cd4
commit 5ba9d374de
5 changed files with 39 additions and 1076 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
display/gmakefile
View file

@ -53,21 +53,21 @@ ALL: $(ALL)
# munching squares; see README file for
# how to use console switches
MUNCH=$(DRIVER) xy.o test.o
MUNCH=$(DRIVER) display.o test.o
munch$(EXT): $(MUNCH)
$(CC) $(LDFLAGS) -o munch$(EXT) $(MUNCH) $(LIBS)
VT11=$(DRIVER) vt11.o vttest.o xy.o
VT11=$(DRIVER) vt11.o vttest.o display.o
vt11$(EXT): $(VT11)
$(CC) $(LDFLAGS) -o vt11$(EXT) $(VT11) $(LIBS)
xy.o: xy.h ws.h
vt11.o: xy.h vt11.h
x11.o: ws.h xy.h
display.o: display.h ws.h
vt11.o: display.h vt11.h
x11.o: ws.h display.h
carbon.o: ws.h
win32.o: ws.h
test.o: xy.h vt11.h
vttest.o: xy.h vt11.h vtmacs.h
test.o: display.h vt11.h
vttest.o: display.h vt11.h vtmacs.h
clean:
ifeq ($(WIN32),)

14
display/smakefile
View file

@ -64,21 +64,21 @@ ALL: $(ALL)
# munching squares; see README file for
# how to use console switches
MUNCH=$(DRIVER) xy.o test.o
MUNCH=$(DRIVER) display.o test.o
munch$(EXT): $(MUNCH)
$(CC) $(LDFLAGS) -o munch$(EXT) $(MUNCH) $(LIBS)
VT11=$(DRIVER) vt11.o vttest.o xy.o
VT11=$(DRIVER) vt11.o vttest.o display.o
vt11$(EXT): $(VT11)
$(CC) $(LDFLAGS) -o vt11$(EXT) $(VT11) $(LIBS)
xy.o: xy.h ws.h
vt11.o: xy.h vt11.h
x11.o: ws.h xy.h
display.o: display.h ws.h
vt11.o: display.h vt11.h
x11.o: ws.h display.h
carbon.o: ws.h
win32.o: ws.h
test.o: xy.h vt11.h
vttest.o: xy.h vt11.h vtmacs.h
test.o: display.h vt11.h
vttest.o: display.h vt11.h vtmacs.h
clean:
rm -f *.o *~ .#* # Unix

19
display/test.c
View file

@ -11,7 +11,7 @@
*/
/*
* Copyright (c) 2003-2004, Philip L. Budne
* Copyright (c) 2003-2018, Philip L. Budne
*
* Permission is hereby granted, free of charge, to any person obtaining a
* copy of this software and associated documentation files (the "Software"),
@ -57,18 +57,17 @@
static unsigned long test_switches = 0;
/* called from display code: */
unsigned long
cpu_get_switches(void) {
return test_switches;
void
cpu_get_switches(unsigned long *p1, unsigned long *p2) {
*p1 = test_switches;
*p2 = 0;
}
/* called from display code: */
void
cpu_set_switches(bits)
unsigned long bits;
{
printf("switches: %06lo\n", bits);
test_switches = bits;
cpu_set_switches(unsigned long w1, unsigned long w2) {
test_switches = w1 ^ w2;
printf("switches: %06lo\n", test_switches);
}
void
@ -178,7 +177,7 @@ main(void) {
if (!display_init(TEST_DIS, TEST_RES, NULL))
exit(EXIT_FAILURE);
cpu_set_switches(04000UL); /* classic starting value */
cpu_set_switches(04000UL,0); /* classic starting value */
for (;;) {
#ifdef T2
t2();

8
display/vttest.c
View file

@ -1380,13 +1380,13 @@ main(void) {
/*
* callbacks from display.c
*/
unsigned long
cpu_get_switches(void) {
return 0;
void
cpu_get_switches(unsigned long *p1, unsigned long *p2) {
*p1 = *p2 = 0;
}
void
cpu_set_switches(unsigned long bits) {
cpu_set_switches(unsigned long w1, unsigned long w2) {
}
/*

1036
display/xy.c
View file

File diff suppressed because it is too large Load diff