Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Comment: | Merge ams/sdl to trunk. |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA3-256: |
4121b8f3e790ea9224db9ef406dd7b3b |
User & Date: | ams 2024-06-26 08:47:55 |
2024-06-26
| ||
10:36 | Clean up indentation slightly. check-in: 569f1e1a5a user: ams tags: trunk | |
08:47 | Merge ams/sdl to trunk. check-in: 4121b8f3e7 user: ams tags: trunk | |
08:47 | notes.text: Delete file. Closed-Leaf check-in: 3802b528da user: ams tags: ams/sdl | |
2024-05-28
| ||
15:02 | uexec.c (advanceLC): Return new target; I'm going to regret this ... check-in: 8ac55b00b4 user: ams tags: trunk | |
Changes to Makefile.
︙ | ︙ | |||
24 25 26 27 28 29 30 | $(CC) $(CFLAGS) -w -I$(CHAOS)/chunix -USELECT -c $< challoc.o: $(CHAOS)/chunix/challoc.c $(CC) $(CFLAGS) -c $< chutil.o: $(CHAOS)/chncp/chutil.c $(CC) $(CFLAGS) -w -I$(CHAOS)/chunix -I. -DSELECT -c $< # X11 as TV backend. | | | | | > > > > | | > > > > > | > > > | | | | > | | 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | $(CC) $(CFLAGS) -w -I$(CHAOS)/chunix -USELECT -c $< challoc.o: $(CHAOS)/chunix/challoc.c $(CC) $(CFLAGS) -c $< chutil.o: $(CHAOS)/chncp/chutil.c $(CC) $(CFLAGS) -w -I$(CHAOS)/chunix -I. -DSELECT -c $< # X11 as TV backend. #CFLAGS += -I/usr/X11R6/include -I/opt/local/include -DWITH_X11=1 #LDFLAGS += -lX11 -L/usr/X11R6/lib -L/opt/local/lib #USIM_TV_BACKEND = x11.o # SDL (version 1) as TV backend. # # N.B. When used with sdl12-compat (SDL1 compatible library that uses # SDL2 as the backend); there are bunch of problems bugs with how # the SDLScreen structure is updated. #CFLAGS += $(shell sdl-config --cflags) -DWITH_SDL1=1 #LDFLAGS += $(shell sdl-config --libs) #USIM_TV_BACKEND = sdl1.o # SDL (version 2) as TV backend. CFLAGS += $(shell sdl2-config --cflags) -DWITH_SDL2=1 -I/usr/X11R6/include LDFLAGS += $(shell sdl2-config --libs) -lm USIM_TV_BACKEND = sdl2.o # Bullshit hack. CFLAGS += -I/opt/homebrew/include -Wno-nonportable-include-path # Headless TV backend. #CFLAGS += #LDFLAGS += #USIM_TV_BACKEND = ucfg.o: ucfg.h ucfg.defs lmch.defs knight.defs $(USIM_TV_BACKEND) iob.o cadet.o knight.o usim.o: lmch.defs knight.defs USIM_UCH11 = uch11.o uch11-local.o uch11-chaosd.o uch11-udp.o \ chutil.o challoc.o chdopen.o chopen.o MINI.o FILE.o glob.o USIM_OBJS = usim.o ucode.o uexec.o umem.o iob.o mouse.o kbd.o knight.o cadet.o tv.o $(USIM_TV_BACKEND) $(USIM_UCH11) disk.o ini.o ucfg.o trace.o udiss.o usym.o misc.o m32.o idle.o \ $(CHAOS)/libhosts/libhosts.a usim: $(USIM_OBJS) $(CC) $(CFLAGS) -o $@ $(USIM_OBJS) -lpthread $(LDFLAGS) READMCR_OBJS = readmcr.o udiss.o misc.o usym.o |
︙ | ︙ |
Changes to README.md.
︙ | ︙ | |||
19 20 21 22 23 24 25 | When usim starts, it tries to read usim.ini which is a INI style configuration file consisting of sections, and key/value pairs. ## `usim` section - `state_filename`: Specifies a state file that is saved either when | | | | | | | | | | | | | | | | | | | | | | | 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | When usim starts, it tries to read usim.ini which is a INI style configuration file consisting of sections, and key/value pairs. ## `usim` section - `state_filename`: Specifies a state file that is saved either when a user sends SIGINFO/SIGUSR1, or on halt if the -d option was passed to usim. - `sys_directory`: Specifies a directory where all System sources live, by mapping the `/tree` prefix in the FILE server to this directory. Note that all other files and directories, outside `/tree` are also available through the local FILE server. Better: use the `fs_root_directory` option below. - `fs_root_directory`: Specifies where the root of the files served by the local FILE server is. This provides a better "sandbox" for the FILE server than the `sys_directory` option. If your sources were previously in your `sys` subdirectory, if you move them to a `tree` subdirectory of the `fs_root_directory`, everything will work fine. You can use links in the `fs_root_directory` if you want to use directories outside it, e.g. `/tmp` or `/home`. - `kbd`: Specify what keyboard type to use. This affects what type of a keyboard the CADR sees, _not_ the actual keyboard layout from the host. Possible values are: - `knight`: Send Knight (old) keyboard scancodes. [Keyboard layout](https://tumbleweed.nu/lm-3/schematics/knight-1-layout.png) - `cadet`: Send Space-Cadet (new) keyboard scancodes. [Keyboard Layout](https://tumbleweed.nu/lm-3/schematics/cadet-1-layout.png), [Front keys](https://tumbleweed.nu/lm-3/schematics/cadet-2-layout.png). - `grab_keyboard`: If set to `true', try to grab the keyboard. ## `ucode` section - `prommcr_filename`: Specifies the boot PROM microcode load. - `promsym_filename`: Specifies the symbol table for the boot PROM. - `mcrsym_filename`: Specifies the symbol table for the microcode. ## `chaos` section - `backend`: Specifies which back-end to use; possible values are: - `daemon`: Tries to connect to the `chaosd` daemon. - `local`: Uses the embedded Chaosnet NCP. - `udp`: Uses Chaos-over-UDP to a Chaosnet bridge. - `myname`: Specifies the name of the simulated machine; this is used to figure out which Chaosnet address we have. - `servername`: Specifies the name of the NCP; this is only used when the Chaosnet backend is `local` (or `udp` with the `udp_local_hybrid` option, see below). - `bridgeip`: IP or host name of the Chaosnet bridge to use for Chaos-over-UDP. - `bridgeport`: UDP port of the Chaosnet bridge (default 42042) - `bridgeport_local`: Local UDP port to use for Chaos-over-UDP (default 42042). - `bridgechaos`: Chaosnet address of the Chaosnet bridge (octal). - `udp_local_hybrid`: Use a hybrid of "local" and "udp", where the address of `servername` is treated locally, but all others are handled over UDP. Requires `udp` backend and configuration of `servername` (and `hosts`). - `hosts`: Hosts table containing hostname to Chaosnet address mappings. The format of this file is the same as for the Lisp Machine. ## `disk` section - `disk0_filename`, `disk1_filename`, `disk2_filename`, `disk3_filename`, `disk4_filename`, `disk5_filename`, `disk6_filename`, `disk7_filename`: Specify which disks drives are available. ## `trace` section - `level`: Specify trace level. See utrace.h for possible levels - `facilities`: Specify what facilities to trace. See utrace.h for possible values. ## `idle` section - `cycles`: amount of cycles since last work to consider idle - `quantum`: cycles to wait until sleep call |
︙ | ︙ | |||
179 180 181 182 183 184 185 | | F4 | n/a | Terminal | | F5 | Top-H | Help | | F6 | Clear | Clear-Input | | F7 | Break | Break | | ------------ | ---------- | ------------ | | Page Up | Top-Call | Abort | | Page Down | | Resume | | | < < | 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 | | F4 | n/a | Terminal | | F5 | Top-H | Help | | F6 | Clear | Clear-Input | | F7 | Break | Break | | ------------ | ---------- | ------------ | | Page Up | Top-Call | Abort | | Page Down | | Resume | | Home | | Break | | End | Top-CR | End | # What programs are here? - usim: MIT CADR simulator - diskmaker: utility for managing disk packs Debugging utilities: - readmcr: microcode disassembler # Release History > v0.10 - TBD > v0.9 - Minor speedups. > Mac OSX (little endian) fixes. |
︙ | ︙ | |||
241 242 243 244 245 246 247 | and Howard were extremely supportive at the just right moment (and answered a lot of email). George offered many good suggestions and answered lots of questions. Steve helped me locate missing pages from "memo 528". Alastair did some amazing work on several Explorer emulators. Bjorn has used the code, offered many suggestions, fixes and improvements. And John's office is where I first saw a 3600 console and said, "what's that?". | < < < < < < < < < < < < < < < < < < < < < < < | 239 240 241 242 243 244 245 | and Howard were extremely supportive at the just right moment (and answered a lot of email). George offered many good suggestions and answered lots of questions. Steve helped me locate missing pages from "memo 528". Alastair did some amazing work on several Explorer emulators. Bjorn has used the code, offered many suggestions, fixes and improvements. And John's office is where I first saw a 3600 console and said, "what's that?". |
Changes to cadet.c.
1 2 3 | /* cadet.c --- Space Cadet (aka new) keyboard translation */ | < | | < < | | | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* cadet.c --- Space Cadet (aka new) keyboard translation */ #include <stdint.h> #include <string.h> #include <stdbool.h> #include "iob.h" #include "kbd.h" #include "lmch.h" #include "misc.h" #include "ucode.h" #include "utrace.h" /* * Second index in CADET_KBD_MAP, gives which shift must be generated. */ #define CADET_IX_UNSHIFT 0 #define CADET_IX_SHIFT 1 #define CADET_IX_TOP 2 |
︙ | ︙ | |||
49 50 51 52 53 54 55 | #define CADET_RIGHT_META 0165 #define CADET_RIGHT_SUPER 065 #define CADET_RIGHT_HYPER 0175 #define CADET_CAPSLOCK 0125 #define CADET_ALTLOCK 015 #define CADET_MODELOCK 03 | < < < < | | | | < < < < | < < < < < < < | < < < < < < < < < < < < < < < | < < < < < < < < | | < | | | | < | | | | < | | | < | | | < | | | < | | | < | | | | < | | < | | | < | | | < | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < > | < | < | | > > > | < < < | < < | > > > > < < < < < | < | < < < < < < < | | | | | | | | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 | #define CADET_RIGHT_META 0165 #define CADET_RIGHT_SUPER 065 #define CADET_RIGHT_HYPER 0175 #define CADET_CAPSLOCK 0125 #define CADET_ALTLOCK 015 #define CADET_MODELOCK 03 static unsigned short cadet_kbd_map[256][2]; static unsigned short cadet_modifier_map[11]; int cadet_shifts = CADET_IX_UNSHIFT; void cadet_allup_event(int mods) { int v; v = (1 << 15) | (mods & 01777); if (iob_csr & (1 << 5)) kbd_queue_key_event(v); /* Already something there, queue this. */ else { kbd_scancode = (1 << 16) | v; DEBUG(TRACE_KBD, "cadet_allup_event() - kbd_scancode = 0%o\n", kbd_scancode); if (iob_csr & (1 << 2)) { iob_csr |= 1 << 5; assert_unibus_interrupt(0260); } } } static void cadet_queue_all_keys_up(void) { cadet_shifts = CADET_IX_UNSHIFT; /* Hmm... */ kbd_queue_key_event((1 << 15) | 0); } void cadet_press_bucky(int bucky, int *mods, int *shifts) { switch (bucky) { case KBD_SHIFT: *mods |= CADET_ALLUP_SHIFT; *shifts |= (1 << CADET_IX_SHIFT); break; case KBD_TOP: *mods |= CADET_ALLUP_TOP; *shifts |= (1 << CADET_IX_TOP); break; case KBD_CONTROL: *mods |= CADET_ALLUP_CONTROL; break; case KBD_META: *mods |= CADET_ALLUP_META; break; case KBD_SHIFT_LOCK: *mods |= CADET_ALLUP_CAPS_LOCK; break; case KBD_MODE_LOCK: *mods |= CADET_ALLUP_MODELOCK; break; case KBD_GREEK: *mods |= CADET_ALLUP_GREEK; *shifts |= (1 << CADET_IX_GREEK); break; case KBD_REPEAT: break; case KBD_ALT_LOCK: *mods |= CADET_ALLUP_ALTLOCK; break; case KBD_HYPER: *mods |= CADET_ALLUP_HYPER; break; case KBD_SUPER: *mods |= CADET_ALLUP_SUPER; break; default: WARNING(TRACE_KBD, "kbd (cadet): unknown bucky key: 0%o\n", bucky); break; } } static void cadet_process_shift(int scc, int keydown) { int shift; DEBUG(TRACE_KBD, "cadet_process_shift(scc = 0%o, keydown = %d)\n", scc, keydown); switch (scc) { case CADET_LEFT_GREEK: case CADET_RIGHT_GREEK: shift = (1 << CADET_IX_GREEK); break; case CADET_LEFT_TOP: case CADET_RIGHT_TOP: shift = (1 << CADET_IX_TOP); break; case CADET_LEFT_SHIFT: case CADET_RIGHT_SHIFT: shift = (1 << CADET_IX_SHIFT); break; default: return; } if (keydown) { cadet_shifts |= shift; } else { cadet_shifts &= ~shift; } } void cadet_process_key(int keysym, /* keysym, acts as index into kbd_map */ int bi, /* bucky, acts as index into modifier_map */ int keydown, /* if key is down or up */ bool (*allup_key)(void) ) { int lmchar; /* Lisp Machine charachter to insert */ int scc; /* Space Cadet scancode. */ int wantshift; /* Index into second column in cadet_kbd_map. */ int shkey; /* Shift key being pressed. */ int oshift; if (!keydown && allup_key() == true) return; oshift = cadet_shifts; DEBUG(TRACE_KBD, "kbd (cadet): keysym = 0%o, bi = %d\n", keysym, bi); if (bi != -1) { int bucky; bucky = kbd_modifier_map[bi]; if (bucky == KBD_NoSymbol) { WARNING(TRACE_KBD, "kbd (cadet): unbound modifier (keysym = 0%o)\n", keysym); return; } scc = cadet_modifier_map[bucky]; cadet_process_shift(scc, keydown); DEBUG(TRACE_KBD, "kbd (cadet): bucky pressed; scc = 0%o, shifts = 0%o (previous: 0%o)\n", scc, cadet_shifts, oshift); kbd_event(scc, keydown); return; } lmchar = kbd_map[keysym]; DEBUG(TRACE_KBD, "kbd (cadet): kbd_map[%d] (lmchar) = 0%o\n", keysym, kbd_map[keysym]); if (lmchar > LMCH_CODE_LIMIT || lmchar == LMCH_NoSymbol) { NOTICE(TRACE_KBD, "kbd (cadet): unable to translate to lispm key (keysym = 0%o)\n", keysym); return; } scc = cadet_kbd_map[lmchar][0]; wantshift = cadet_kbd_map[lmchar][1]; DEBUG(TRACE_KBD, "kbd (cadet): non bucky pressed; scc = 0%o, wantshift = %d\n", scc, wantshift); /* * If modifiers correct, just post the event, else * queue the event and post the appropriate shifts. */ if (((wantshift == CADET_IX_UNSHIFT) && ((cadet_shifts & (1 << CADET_IX_SHIFT)) == 0)) || (cadet_shifts & (1 << wantshift))) { kbd_event(scc, keydown); return; |
︙ | ︙ | |||
309 310 311 312 313 314 315 | if (oshift & (1 << CADET_IX_TOP)) kbd_queue_key_event(CADET_LEFT_TOP); if (oshift & (1 << CADET_IX_SHIFT)) kbd_queue_key_event(CADET_LEFT_SHIFT); if (oshift & (1 << CADET_IX_GREEK)) kbd_queue_key_event(CADET_LEFT_GREEK); cadet_shifts = oshift; | < < > > > > < < | | < | < < < < < < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 | if (oshift & (1 << CADET_IX_TOP)) kbd_queue_key_event(CADET_LEFT_TOP); if (oshift & (1 << CADET_IX_SHIFT)) kbd_queue_key_event(CADET_LEFT_SHIFT); if (oshift & (1 << CADET_IX_GREEK)) kbd_queue_key_event(CADET_LEFT_GREEK); cadet_shifts = oshift; } void cadet_init(void) { NOTICE(TRACE_USIM, "kbd: using new (space cadet) keyboard\n"); /* * Setup mapping from Space Cadet scan-codes to Lisp Machine * characters. */ cadet_modifier_map[KBD_SHIFT] = CADET_LEFT_SHIFT; cadet_modifier_map[KBD_TOP] = CADET_LEFT_TOP; cadet_modifier_map[KBD_CONTROL] = CADET_LEFT_CONTROL; cadet_modifier_map[KBD_META] = CADET_LEFT_META; cadet_modifier_map[KBD_SUPER] = CADET_LEFT_SUPER; cadet_modifier_map[KBD_HYPER] = CADET_LEFT_HYPER; cadet_modifier_map[KBD_SHIFT_LOCK] = CADET_CAPSLOCK; #define X(lmch, scc, wantshift) \ cadet_kbd_map[LMCH_##lmch][0] = scc; cadet_kbd_map[LMCH_##lmch][1] = wantshift; #include "cadet.defs" /* Hacks... */ #if 0 X(LMCH_bracketleft, 0166, CADET_IX_UNSHIFT); X(LMCH_bracketright, 0146, CADET_IX_UNSHIFT); X(LMCH_braceleft, 0132, CADET_IX_SHIFT); X(LMCH_braceright, 0137, CADET_IX_SHIFT); #endif #undef X } |
Added cadet.defs.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 | /* cadet.defs --- Space Cadet keyboard mappings -*- C -*- * * The syntax of the X macro is as follows: * X(name, value, shift) */ /* Unshifted */ X(macro, 0100, CADET_IX_UNSHIFT) X(terminal, 0040, CADET_IX_UNSHIFT) X(quote, 0120, CADET_IX_UNSHIFT) X(overstrike, 0160, CADET_IX_UNSHIFT) X(clear_input, 0110, CADET_IX_UNSHIFT) X(clear_screen, 0050, CADET_IX_UNSHIFT) X(hold_output, 0030, CADET_IX_UNSHIFT) X(stop_output, 0170, CADET_IX_UNSHIFT) X(abort, 0067, CADET_IX_UNSHIFT) X(break, 0167, CADET_IX_UNSHIFT) X(resume, 0047, CADET_IX_UNSHIFT) X(call, 0107, CADET_IX_UNSHIFT) X(roman_i, 0101, CADET_IX_UNSHIFT) X(roman_ii, 0001, CADET_IX_UNSHIFT) X(system, 0141, CADET_IX_UNSHIFT) X(colon, 0021, CADET_IX_UNSHIFT) X(1, 0121, CADET_IX_UNSHIFT) X(2, 0061, CADET_IX_UNSHIFT) X(3, 0161, CADET_IX_UNSHIFT) X(4, 0011, CADET_IX_UNSHIFT) X(5, 0111, CADET_IX_UNSHIFT) X(6, 0051, CADET_IX_UNSHIFT) X(7, 0151, CADET_IX_UNSHIFT) X(8, 0031, CADET_IX_UNSHIFT) X(9, 0071, CADET_IX_UNSHIFT) X(0, 0171, CADET_IX_UNSHIFT) X(minus, 0131, CADET_IX_UNSHIFT) X(equal, 0126, CADET_IX_UNSHIFT) X(braceleft, 0166, CADET_IX_UNSHIFT) X(braceright, 0146, CADET_IX_UNSHIFT) X(status, 0046, CADET_IX_UNSHIFT) X(hand_up, 0106, CADET_IX_UNSHIFT) X(hand_down, 0176, CADET_IX_UNSHIFT) X(roman_iii, 0102, CADET_IX_UNSHIFT) X(roman_iv, 0002, CADET_IX_UNSHIFT) X(network, 0042, CADET_IX_UNSHIFT) X(tab, 0022, CADET_IX_UNSHIFT) X(q, 0122, CADET_IX_UNSHIFT) X(w, 0062, CADET_IX_UNSHIFT) X(e, 0162, CADET_IX_UNSHIFT) X(r, 0012, CADET_IX_UNSHIFT) X(t, 0112, CADET_IX_UNSHIFT) X(y, 0052, CADET_IX_UNSHIFT) X(u, 0152, CADET_IX_UNSHIFT) X(i, 0032, CADET_IX_UNSHIFT) X(o, 0072, CADET_IX_UNSHIFT) X(p, 0172, CADET_IX_UNSHIFT) X(parenleft, 0132, CADET_IX_UNSHIFT) X(parenright, 0137, CADET_IX_UNSHIFT) X(grave, 0077, CADET_IX_UNSHIFT) X(backslash, 0037, CADET_IX_UNSHIFT) X(delete, 0157, CADET_IX_UNSHIFT) X(hand_left, 0117, CADET_IX_UNSHIFT) X(hand_right, 0017, CADET_IX_UNSHIFT) X(altmode, 0143, CADET_IX_UNSHIFT) X(rubout, 0023, CADET_IX_UNSHIFT) X(a, 0123, CADET_IX_UNSHIFT) X(s, 0063, CADET_IX_UNSHIFT) X(d, 0163, CADET_IX_UNSHIFT) X(f, 0013, CADET_IX_UNSHIFT) X(g, 0113, CADET_IX_UNSHIFT) X(h, 0053, CADET_IX_UNSHIFT) X(j, 0153, CADET_IX_UNSHIFT) X(k, 0033, CADET_IX_UNSHIFT) X(l, 0073, CADET_IX_UNSHIFT) X(semicolon, 0173, CADET_IX_UNSHIFT) X(apostrophe, 0133, CADET_IX_UNSHIFT) X(return, 0136, CADET_IX_UNSHIFT) X(line, 0036, CADET_IX_UNSHIFT) X(end, 0156, CADET_IX_UNSHIFT) X(help, 0116, CADET_IX_UNSHIFT) X(z, 0124, CADET_IX_UNSHIFT) X(x, 0064, CADET_IX_UNSHIFT) X(c, 0164, CADET_IX_UNSHIFT) X(v, 0014, CADET_IX_UNSHIFT) X(b, 0114, CADET_IX_UNSHIFT) X(n, 0054, CADET_IX_UNSHIFT) X(m, 0154, CADET_IX_UNSHIFT) X(comma, 0034, CADET_IX_UNSHIFT) X(period, 0074, CADET_IX_UNSHIFT) X(slash, 0174, CADET_IX_UNSHIFT) X(space, 0134, CADET_IX_UNSHIFT) /* Shift */ X(plus_minus, 0021, CADET_IX_SHIFT) X(exclam, 0121, CADET_IX_SHIFT) X(at, 0061, CADET_IX_SHIFT) X(numbersign, 0161, CADET_IX_SHIFT) X(dollar, 0011, CADET_IX_SHIFT) X(percent, 0111, CADET_IX_SHIFT) X(asciicircum, 0051, CADET_IX_SHIFT) X(ampersand, 0151, CADET_IX_SHIFT) X(asterisk, 0031, CADET_IX_SHIFT) X(parenleft, 0071, CADET_IX_SHIFT) X(parenright, 0171, CADET_IX_SHIFT) X(underscore, 0131, CADET_IX_SHIFT) X(plus, 0126, CADET_IX_SHIFT) X(less, 0034, CADET_IX_SHIFT) X(greater, 0074, CADET_IX_SHIFT) X(Q, 0122, CADET_IX_SHIFT) X(W, 0062, CADET_IX_SHIFT) X(E, 0162, CADET_IX_SHIFT) X(R, 0012, CADET_IX_SHIFT) X(T, 0112, CADET_IX_SHIFT) X(Y, 0052, CADET_IX_SHIFT) X(U, 0152, CADET_IX_SHIFT) X(I, 0032, CADET_IX_SHIFT) X(O, 0072, CADET_IX_SHIFT) X(P, 0172, CADET_IX_SHIFT) X(bracketleft, 0132, CADET_IX_SHIFT) X(bracketright, 0137, CADET_IX_SHIFT) X(asciitilde, 0077, CADET_IX_SHIFT) X(bar, 0037, CADET_IX_SHIFT) X(A, 0123, CADET_IX_SHIFT) X(S, 0063, CADET_IX_SHIFT) X(D, 0163, CADET_IX_SHIFT) X(F, 0013, CADET_IX_SHIFT) X(G, 0113, CADET_IX_SHIFT) X(H, 0053, CADET_IX_SHIFT) X(J, 0153, CADET_IX_SHIFT) X(K, 0033, CADET_IX_SHIFT) X(L, 0073, CADET_IX_SHIFT) X(quotedbl, 0133, CADET_IX_SHIFT) X(Z, 0124, CADET_IX_SHIFT) X(X, 0064, CADET_IX_SHIFT) X(C, 0164, CADET_IX_SHIFT) X(V, 0014, CADET_IX_SHIFT) X(B, 0114, CADET_IX_SHIFT) X(N, 0054, CADET_IX_SHIFT) X(M, 0154, CADET_IX_SHIFT) X(question, 0174, CADET_IX_SHIFT) /* Top */ X(and_sign, 0122, CADET_IX_TOP) X(or_sign, 0062, CADET_IX_TOP) X(up_horseshoe, 0162, CADET_IX_TOP) X(down_horseshoe, 0012, CADET_IX_TOP) X(left_horseshoe, 0112, CADET_IX_TOP) X(right_horseshoe, 0052, CADET_IX_TOP) X(universal_quantifier, 0152, CADET_IX_TOP) X(infinity, 0032, CADET_IX_TOP) X(existential_quantifier, 0072, CADET_IX_TOP) X(partial_delta, 0172, CADET_IX_TOP) X(up_arrow, 0113, CADET_IX_TOP) X(down_arrow, 0053, CADET_IX_TOP) X(left_arrow, 0153, CADET_IX_TOP) X(right_arrow, 0033, CADET_IX_TOP) X(double_arrow, 0073, CADET_IX_TOP) X(not_equal, 0164, CADET_IX_TOP) X(equivalence, 0114, CADET_IX_TOP) X(less_or_equal, 0054, CADET_IX_TOP) X(greater_or_equal, 0154, CADET_IX_TOP) /* Greek */ X(circle_plus, 0176, CADET_IX_GREEK) X(epsilon, 0162, CADET_IX_GREEK) X(pi, 0172, CADET_IX_GREEK) X(not_sign, 0077, CADET_IX_GREEK) X(circle_x, 0117, CADET_IX_GREEK) X(alpha, 0123, CADET_IX_GREEK) X(delta, 0163, CADET_IX_GREEK) X(gamma, 0113, CADET_IX_GREEK) X(lambda, 0073, CADET_IX_GREEK) X(center_dot, 0133, CADET_IX_GREEK) X(beta, 0114, CADET_IX_GREEK) X(integral, 0174, CADET_IX_GREEK) |
Changes to cadet.h.
1 2 | #pragma once | | | | | | | 1 2 3 4 5 6 7 8 9 10 | #pragma once #include <stdbool.h> int cadet_shifts; extern void cadet_init(void); extern void cadet_allup_event(int); extern void cadet_process_key(int, int, int, bool (*)(void)); extern void cadet_press_bucky(int, int *, int *); |
Changes to idle.c.
︙ | ︙ | |||
8 9 10 11 12 13 14 | #include <unistd.h> #include "idle.h" #include "tv.h" #include "ucode.h" #include "usim.h" | | | | | | | | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 | #include <unistd.h> #include "idle.h" #include "tv.h" #include "ucode.h" #include "usim.h" static int working; static size_t last_work; static size_t last_cycle; static int reported_idle; /*debug */ static int drl; static int disk_run_light; size_t idle_cycles; size_t idle_quantum; size_t idle_timeout; static idle_change_handler change_handler; static int maxfd; static int registered_fds[FD_SETSIZE]; void idle_init(void) { int val; sym_find(&sym_mcr, "A-DISK-RUN-LIGHT", &val); |
︙ | ︙ |
Changes to iob.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* iob.c --- CADR I/O board */ #include <sys/time.h> #include <stdint.h> #include <stdio.h> #include "utrace.h" #include "kbd.h" #include "mouse.h" #include "uch11.h" uint32_t iob_csr; static uint32_t iob_usec; static uint32_t get_us_clock(void) { | > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | /* iob.c --- CADR I/O board */ #include <sys/time.h> #include <stdint.h> #include <stdio.h> #include "utrace.h" #include "kbd.h" #include "mouse.h" #include "uch11.h" #if WITH_X11 #include "x11.h" #elif WITH_SDL1 #include "sdl1.h" #elif WITH_SDL2 #include "sdl2.h" #endif uint32_t iob_csr; static uint32_t iob_usec; static uint32_t get_us_clock(void) { |
︙ | ︙ | |||
59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 | break; case 0106: *pv = (mouse_rawx << 12) | (mouse_rawy << 14) | (mouse_x & 07777); INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse x %011o\n", *pv); break; case 0110: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: beep\n"); fprintf(stderr, "\a"); /* Beep! */ break; case 0112: *pv = iob_csr; INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: kbd csr %011o\n", *pv); break; case 0120: iob_usec = get_us_clock(); | > > > > > > > > > > > > > > > | 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | break; case 0106: *pv = (mouse_rawx << 12) | (mouse_rawy << 14) | (mouse_x & 07777); INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse x %011o\n", *pv); break; case 0110: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: beep\n"); /* * This is triggered by older code that does a %UNIBUS-READ. */ // MMcM: It's the number of microseconds between triggers of the // flip-flop. That is, half the wavelength. So the frequency is, I // think, (/ 1e6 (* #o1350 2)). So I guess 672Hz. And duration is // only .13sec. #if WITH_X11 x11_beep(); #elif WITH_SDL1 sdl1_beep(-1); #elif WITH_SDL2 sdl2_beep(-1); #else fprintf(stderr, "\a"); /* Beep! */ #endif break; case 0112: *pv = iob_csr; INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: kbd csr %011o\n", *pv); break; case 0120: iob_usec = get_us_clock(); |
︙ | ︙ | |||
132 133 134 135 136 137 138 139 140 141 142 143 144 145 | INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse y\n"); break; case 0106: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse x\n"); break; case 0110: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: beep\n"); break; case 0112: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: kbd csr\n"); iob_csr = (iob_csr & ~017) | (v & 017); break; case 0120: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: usec clock\n"); | > > > > > > > > > > > > | 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 | INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse y\n"); break; case 0106: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: mouse x\n"); break; case 0110: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: beep\n"); /* * Triggered via %BEEP. */ #if WITH_X11 x11_beep(); #elif WITH_SDL1 sdl1_beep(v); #elif WITH_SDL2 sdl2_beep(v); #else fprintf(stderr, "\a"); /* Beep! */ #endif break; case 0112: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: kbd csr\n"); iob_csr = (iob_csr & ~017) | (v & 017); break; case 0120: INFO(TRACE_IOB | TRACE_UNIBUS, "unibus: usec clock\n"); |
︙ | ︙ |
Changes to kbd.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 | /* kbd.c --- keyboard handling */ #include <err.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "iob.h" #include "kbd.h" #include "usim.h" #include "utrace.h" int kbd_type = 1; /* Default is "cadet". */ uint32_t kbd_scancode; #define KEY_QUEUE_LEN 10 static int key_queue[KEY_QUEUE_LEN]; static int key_queue_optr; static int key_queue_iptr; static int key_queue_free = KEY_QUEUE_LEN; void kbd_queue_key_event(int ev) { int v; v = (1 << 16) | ev; | > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | /* kbd.c --- keyboard handling */ #include <err.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include "iob.h" #include "kbd.h" #include "cadet.h" #include "knight.h" #include "lmch.h" #include "usim.h" #include "utrace.h" int kbd_type = 1; /* Default is "cadet". */ uint32_t kbd_scancode; #define KEY_QUEUE_LEN 10 static int key_queue[KEY_QUEUE_LEN]; static int key_queue_optr; static int key_queue_iptr; static int key_queue_free = KEY_QUEUE_LEN; /* * Translation map for the host keyboard to a corresponding Lisp * Machine character or modifier. */ int kbd_map[65535]; int kbd_modifier_map[8]; void kbd_queue_key_event(int ev) { int v; v = (1 << 16) | ev; |
︙ | ︙ | |||
86 87 88 89 90 91 92 | /* You hold down all four control and meta keys on your keyboard, and hit return if you want to use the same virtual memory as now, or rubout if you want to load a new copy of virtual memory. Hitting other keys is undefined. | < < < < | 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 | /* You hold down all four control and meta keys on your keyboard, and hit return if you want to use the same virtual memory as now, or rubout if you want to load a new copy of virtual memory. Hitting other keys is undefined. The incantations used for warm-booting and cold-booting involve holding down all four control and meta keys simultaneously (the two to the left of the space bar and the two to the right of the space bar), and striking RUBOUT for a cold-boot or RETURN for a warm-boot. This combination of keys is extremely difficult to type accidentally. RMS@MIT-AI 01/02/79 05:17:38 To: (BUG LISPM) at MIT-AI C-M-C-M-digit should load the band for that digit. ;Enter here from the PROM. Virtual memory is not valid yet. (LOC 6) PROM (JUMP-NOT-EQUAL-XCT-NEXT Q-R A-ZERO PROM) ;These 2 instructions duplicate the prom ((Q-R) ADD Q-R A-MINUS-ONE) ;;; Decide whether to restore virtual memory from saved band on disk, i.e. ;;; whether this is a cold boot or a warm boot. If the keyboard has input ;;; available, and the character was RETURN (rather than RUBOUT), it's a warm boot. (CALL-XCT-NEXT PHYS-MEM-READ) ((VMA) (A-CONSTANT 17772045)) ;Unibus address 764112 (KBD CSR) (JUMP-IF-BIT-CLEAR (BYTE-FIELD 1 5) MD ;If keyboard is not ready, COLD-BOOT) ; assume we are supposed to cold-boot (CALL-XCT-NEXT PHYS-MEM-READ) ((VMA) (A-CONSTANT 17772040)) ;Unibus address 764100 (KBD LOW) ((MD) (BYTE-FIELD 6 0) MD) ;Get keycode (JUMP-EQUAL MD (A-CONSTANT 46) COLD-BOOT) ;This is cold-boot if key is RUBOUT ((MD) (A-CONSTANT 46)) ;Standardize mode. Mostly, set to NORMAL speed (CALL-XCT-NEXT PHYS-MEM-WRITE) ;40 is PROM-DISABLE, 2 is NORMAL speed. ((VMA) (A-CONSTANT 17773005)) ;Unibus 766012 (JUMP BEG0000) // ukbd -- cadet prom ;Is request to boot machine if both controls and both metas are held ;down, along with rubout or return. We have just sent the key-down codes ;for all of those keys. We now send a boot character, then set a flag preventing ;sending of up-codes until the next down-code. This gives the machine time |
︙ | ︙ | |||
202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 | { for (int i = 0; lmchar_map[i].name; i++) { if (streq(key, lmchar_map[i].name) == true) return lmchar_map[i].lmchar; } return LMCH_NoSymbol; } void kbd_init(void) { if (kbd_type == 0) knight_init(); else cadet_init(); } | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 | { for (int i = 0; lmchar_map[i].name; i++) { if (streq(key, lmchar_map[i].name) == true) return lmchar_map[i].lmchar; } return LMCH_NoSymbol; } #include <X11/keysym.h> // for XK_FOO meh #include <X11/X.h> // for FOOMapIndex meh void kbd_default_map(void) { for (int i = 0; i < (int) NELEM(kbd_map); i++) kbd_map[i] = LMCH_NoSymbol; for (int i = 0; i < (int) NELEM(kbd_modifier_map); i++) kbd_modifier_map[i] = KBD_NoSymbol; /* *INDENT-OFF* */ /* * Initialize keyboard modifiers */ kbd_modifier_map[ShiftMapIndex] = KBD_SHIFT; /* Shift */ kbd_modifier_map[LockMapIndex] = KBD_SHIFT_LOCK; /* Caps Lock */ kbd_modifier_map[ControlMapIndex] = KBD_CONTROL; /* Control */ kbd_modifier_map[Mod1MapIndex] = KBD_META; /* Alt */ kbd_modifier_map[Mod2MapIndex] = KBD_NoSymbol; /* Num Lock */ kbd_modifier_map[Mod3MapIndex] = KBD_NoSymbol; /* ??? */ kbd_modifier_map[Mod4MapIndex] = KBD_TOP; /* Super */ kbd_modifier_map[Mod5MapIndex] = KBD_NoSymbol; /* AltGR */ /* * Initialize keyboard mapping. * * We cann't reuse lmch.defs here because the Lisp Machine * charachter set has names and charachters that do not have a * corresponding mapping in X11. */ /* Function keys */ /* * LispM "Escape" is actually Terminal, but in Zmacs this is more * useful. */ kbd_map[XK_Escape] = LMCH_altmode; kbd_map[XK_F1] = LMCH_system; kbd_map[XK_F2] = LMCH_network; kbd_map[XK_F3] = LMCH_status; kbd_map[XK_F4] = LMCH_terminal; kbd_map[XK_F5] = LMCH_help; kbd_map[XK_F6] = LMCH_clear; kbd_map[XK_F7] = LMCH_break; kbd_map[XK_Page_Up] = LMCH_abort; kbd_map[XK_Page_Down] = LMCH_resume; kbd_map[XK_Home] = LMCH_break; /* This is really handy next to the others */ kbd_map[XK_End] = LMCH_end; /* This is natural */ kbd_map[XK_Left] = LMCH_hand_left; kbd_map[XK_Right] = LMCH_hand_right; kbd_map[XK_Up] = LMCH_hand_up; kbd_map[XK_Down] = LMCH_hand_down; /* Unshifted */ kbd_map[XK_grave] = LMCH_grave; kbd_map[XK_1] = LMCH_1; kbd_map[XK_2] = LMCH_2; kbd_map[XK_3] = LMCH_3; kbd_map[XK_4] = LMCH_4; kbd_map[XK_5] = LMCH_5; kbd_map[XK_6] = LMCH_6; kbd_map[XK_7] = LMCH_7; kbd_map[XK_8] = LMCH_8; kbd_map[XK_9] = LMCH_9; kbd_map[XK_0] = LMCH_0; kbd_map[XK_minus] = LMCH_minus; kbd_map[XK_equal] = LMCH_equal; kbd_map[XK_Tab] = LMCH_tab; kbd_map[XK_q] = LMCH_q; kbd_map[XK_w] = LMCH_w; kbd_map[XK_e] = LMCH_e; kbd_map[XK_r] = LMCH_r; kbd_map[XK_t] = LMCH_t; kbd_map[XK_y] = LMCH_y; kbd_map[XK_u] = LMCH_u; kbd_map[XK_i] = LMCH_i; kbd_map[XK_o] = LMCH_o; kbd_map[XK_p] = LMCH_p; kbd_map[XK_bracketleft] = LMCH_bracketleft; kbd_map[XK_bracketright] = LMCH_bracketright; kbd_map[XK_backslash] = LMCH_backslash; kbd_map[XK_BackSpace] = LMCH_rubout; kbd_map[XK_a] = LMCH_a; kbd_map[XK_s] = LMCH_s; kbd_map[XK_d] = LMCH_d; kbd_map[XK_f] = LMCH_f; kbd_map[XK_g] = LMCH_g; kbd_map[XK_h] = LMCH_h; kbd_map[XK_j] = LMCH_j; kbd_map[XK_k] = LMCH_k; kbd_map[XK_l] = LMCH_l; kbd_map[XK_semicolon] = LMCH_semicolon; kbd_map[XK_apostrophe] = LMCH_apostrophe; kbd_map[XK_Return] = LMCH_cr; kbd_map[XK_z] = LMCH_z; kbd_map[XK_x] = LMCH_x; kbd_map[XK_c] = LMCH_c; kbd_map[XK_v] = LMCH_v; kbd_map[XK_b] = LMCH_b; kbd_map[XK_n] = LMCH_n; kbd_map[XK_m] = LMCH_m; kbd_map[XK_comma] = LMCH_comma; kbd_map[XK_period] = LMCH_period; kbd_map[XK_slash] = LMCH_slash; /* Shifted */ kbd_map[XK_asciitilde] = LMCH_asciitilde; kbd_map[XK_exclam] = LMCH_exclam; kbd_map[XK_at] = LMCH_at; kbd_map[XK_numbersign] = LMCH_numbersign; kbd_map[XK_dollar] = LMCH_dollar; kbd_map[XK_percent] = LMCH_percent; kbd_map[XK_asciicircum] = LMCH_asciicircum; kbd_map[XK_ampersand] = LMCH_ampersand; kbd_map[XK_asterisk] = LMCH_asterisk; kbd_map[XK_parenleft] = LMCH_parenleft; kbd_map[XK_parenright] = LMCH_parenright; kbd_map[XK_underscore] = LMCH_underscore; kbd_map[XK_plus] = LMCH_plus; kbd_map[XK_Q] = LMCH_Q; kbd_map[XK_W] = LMCH_W; kbd_map[XK_E] = LMCH_E; kbd_map[XK_R] = LMCH_R; kbd_map[XK_T] = LMCH_T; kbd_map[XK_Y] = LMCH_Y; kbd_map[XK_U] = LMCH_U; kbd_map[XK_I] = LMCH_I; kbd_map[XK_O] = LMCH_O; kbd_map[XK_P] = LMCH_P; kbd_map[XK_braceleft] = LMCH_braceleft; kbd_map[XK_braceright] = LMCH_braceright; kbd_map[XK_bar] = LMCH_bar; kbd_map[XK_A] = LMCH_A; kbd_map[XK_S] = LMCH_S; kbd_map[XK_D] = LMCH_D; kbd_map[XK_F] = LMCH_F; kbd_map[XK_G] = LMCH_G; kbd_map[XK_H] = LMCH_H; kbd_map[XK_J] = LMCH_J; kbd_map[XK_K] = LMCH_K; kbd_map[XK_L] = LMCH_L; kbd_map[XK_colon] = LMCH_colon; kbd_map[XK_quotedbl] = LMCH_quotedbl; kbd_map[XK_Z] = LMCH_Z; kbd_map[XK_X] = LMCH_X; kbd_map[XK_C] = LMCH_C; kbd_map[XK_V] = LMCH_V; kbd_map[XK_B] = LMCH_B; kbd_map[XK_N] = LMCH_N; kbd_map[XK_M] = LMCH_M; kbd_map[XK_less] = LMCH_less; kbd_map[XK_greater] = LMCH_greater; kbd_map[XK_question] = LMCH_question; kbd_map[XK_space] = LMCH_space; /* *INDENT-ON* */ } void kbd_init(void) { // kbd_default_map(); if (kbd_type == 0) knight_init(); else cadet_init(); } |
Changes to kbd.h.
1 2 3 4 | #pragma once #include <stdint.h> | < < < < | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | #pragma once #include <stdint.h> /* * This is an index into knight_modifier_map or cadet_modifier_map, * which is used via kbd_modifier_map (which if KBD_NoSymbol means the * modifier is unmapped). */ #define KBD_NoSymbol -1 #define KBD_SHIFT 0 /* SHIFT BITS */ #define KBD_TOP 1 /* TOP BITS */ #define KBD_CONTROL 2 /* CONTROL BITS */ #define KBD_META 3 /* META BITS */ #define KBD_SHIFT_LOCK 4 /* SHIFT LOCK / CAPS LOCK ON CADET */ /* The following do not exsit on the Knight keyboard. */ #define KBD_MODE_LOCK 5 #define KBD_GREEK 6 #define KBD_REPEAT 7 #define KBD_ALT_LOCK 8 #define KBD_HYPER 9 #define KBD_SUPER 10 extern int kbd_type; extern uint32_t kbd_scancode; extern int kbd_map[65535]; extern int kbd_modifier_map[8]; extern void kbd_init(void); extern void kbd_default_map(void); extern void kbd_event(int, int); extern void kbd_queue_key_event(int); extern void kbd_dequeue_key_event(void); extern void kbd_warm_boot_key(void); extern int kbd_lmchar(const char *); |
Changes to knight.c.
1 2 3 4 5 6 | /* knight.c --- Knight (aka old) keyboard */ #include <err.h> #include <stdio.h> #include <string.h> | | | | | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | | | | | < < > > > > < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 | /* knight.c --- Knight (aka old) keyboard */ #include <err.h> #include <stdio.h> #include <string.h> #include "kbd.h" #include "lmch.h" #include "utrace.h" #define KNIGHT_VANILLA 0 /* VANILLA */ #define KNIGHT_SHIFT 0300 /* SHIFT BITS */ #define KNIGHT_TOP 01400 /* TOP BITS */ #define KNIGHT_CONTROL 06000 /* CONTROL BITS */ #define KNIGHT_META 030000 /* META BITS */ #define KNIGHT_SHIFT_LOCK 040000 /* SHIFT LOCK */ static enum { #define X(n, v) KNIGHT_##n = v, #include "knight.defs" #undef X } knight_keysyms; static unsigned short knight_kbd_map[256]; static unsigned short knight_modifier_map[5]; void knight_process_bucky(int k, int *extra) { switch (k) { case KBD_SHIFT: case KBD_TOP: case KBD_CONTROL: case KBD_META: *extra |= knight_modifier_map[k]; break; case KBD_SHIFT_LOCK: *extra ^= knight_modifier_map[k]; break; default: WARNING(TRACE_KBD, "kbd (knight): unknown bucky key: 0%o\n", k); break; } } void knight_process_key(int keysym, int bi, int keydown) { int kc; /* Knight scancode. */ int lmchar; /* Lisp machine character to insert */ DEBUG(TRACE_KBD, "knight_process_key() - keysym = 0%o, bi = %d\n", keysym, bi); if (bi != -1) { DEBUG(TRACE_KBD, "knight_process_key() - bucky short-circuit\n"); return; } lmchar = kbd_map[keysym]; DEBUG(TRACE_KBD, "knight_process_key() - kbd_map[%d] (lmchar) = 0%o\n", keysym, kbd_map[keysym]); if (lmchar > LMCH_CODE_LIMIT || lmchar == LMCH_NoSymbol) { WARNING(TRACE_KBD, "kbd (knight): unable to translate keycode: 0%o\n", lmchar); return; } kc = knight_kbd_map[lmchar]; DEBUG(TRACE_KBD, "knight_process_key() - kc = 0%o\n", kc); /* * Keep Control and Meta bits, Shift is in the scancode table */ kc |= bi & ~KNIGHT_SHIFT; /* * ... but if Control or Meta, add in Shift. */ if (bi & (17 << 10)) kc |= bi; kc |= 0xffff0000; DEBUG(TRACE_KBD, "knight_process_key() - kbd_event(kc = 0%o, keydown = %d)\n", kc, keydown); kbd_event(kc, keydown); } void knight_init(void) { NOTICE(TRACE_USIM, "kbd (knight): initializing keyboard\n"); /* * Setup mapping from Knight scan-codes to Lisp Machine * characters. */ knight_modifier_map[KBD_SHIFT] = KNIGHT_SHIFT; knight_modifier_map[KBD_TOP] = KNIGHT_TOP; knight_modifier_map[KBD_CONTROL] = KNIGHT_CONTROL; knight_modifier_map[KBD_META] = KNIGHT_META; knight_modifier_map[KBD_SHIFT_LOCK] = KNIGHT_SHIFT_LOCK; #define X(n, ign0) knight_kbd_map[LMCH_##n] = KNIGHT_##n; #include "knight.defs" #undef X } |
Changes to knight.h.
1 2 | #pragma once | < < | > | 1 2 3 4 5 | #pragma once extern void knight_init(void); extern void knight_process_key(int, int, int); extern void knight_process_bucky(int, int *); |
Changes to lmdf.text.
1 2 3 4 5 6 7 8 9 | LMDF format description LMDF Format (version 1); roughly 4c4d 4446 0100 0000 LMDF.... ; 32-bit magic + 32-bit version 5044 4c49 0100 0000 PDLI.... ; 32-bit string + 32-bit length 0301 0000 .... ; data... 5044 4c50 0100 0000 PDLP.... 0701 0000 .... | > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 | LMDF format description The dump file is a sequence of 32 bit words. It starts with one word of magic ("LDMF"), followed by a word of the current version (0x0001 at the moment). It then consists of a sequence of segments. Each segment starts with a one-word tag (four ASCII letters), then a one-word length, then <length> words of data. At the moment, the following segments are dumped: - LVMS: Lisp Machine Version (78, 98 or 99) - PDLI: the PDL index - PDLP: the PDL pointer - LCLV: the last value of LC - LCHL: the list of recent LC values - L1MP: the L1 map (one word per entry) - L2MP: the L2 map (one word per entry) - PDLM: the PDL memory - PMEM: the physical memory Any program reading or writing dump files should just ignore any unknown segments. LMDF Format (version 1); roughly 4c4d 4446 0100 0000 LMDF.... ; 32-bit magic + 32-bit version 5044 4c49 0100 0000 PDLI.... ; 32-bit string + 32-bit length 0301 0000 .... ; data... 5044 4c50 0100 0000 PDLP.... 0701 0000 .... |
︙ | ︙ |
Changes to m32.h.
︙ | ︙ | |||
13 14 15 16 17 18 19 | co = (ci) ? (((b) >= ~(a)) ? 0:1) : (((b) > ~(a)) ? 0:1) ; #define sub32(a, b, ci, out, co) \ out = (a) - (b) - ((ci) ? 0 : 1); \ co = (unsigned)(out) < (unsigned)(a) ? 1 : 0; #define abs32(a) \ (a) < 0 ? ~(a) + 1 : (a) | | | 13 14 15 16 17 18 19 20 | co = (ci) ? (((b) >= ~(a)) ? 0:1) : (((b) > ~(a)) ? 0:1) ; #define sub32(a, b, ci, out, co) \ out = (a) - (b) - ((ci) ? 0 : 1); \ co = (unsigned)(out) < (unsigned)(a) ? 1 : 0; #define abs32(a) \ (a) < 0 ? ~(a) + 1 : (a) extern uint32_t rol32(uint32_t, int); |
Changes to misc.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | /* misc.c --- random utilities */ #include <ctype.h> #include <err.h> #include <stdbool.h> #include <stdio.h> #include <string.h> #include "misc.h" bool streq(const char *a, const char *b) { return strcmp(a, b) == 0; } | > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 | /* misc.c --- random utilities */ #include <errno.h> #include <ctype.h> #include <err.h> #include <stdbool.h> #include <stdio.h> #include <string.h> #include "misc.h" ssize_t xgetline(char **l, size_t *n, FILE *f) { int old_errno = errno; size_t ret; old_errno = errno; errno = 0; ret = getline (l, n, f); if (!feof (f) && ferror (f)) { perror("getline failed"); exit(EXIT_FAILURE); } errno = old_errno; return ret; } bool streq(const char *a, const char *b) { return strcmp(a, b) == 0; } |
︙ | ︙ |
Changes to misc.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | #pragma once #include <stdbool.h> #include <stdint.h> #include <unistd.h> #ifndef O_BINARY #define O_BINARY 0 #endif #define BLOCKSZ (256 * 4) #define _STRINGIFY(s) #s #define STRINGIFY(s) _STRINGIFY(s) #define NELEM(x) (sizeof(x)/sizeof(*x)) extern bool streq(const char *, const char *); extern char *strlwr(char *); extern void dumpmem(char *, int); extern uint16_t read16le(int); | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #pragma once #include <stdbool.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <unistd.h> #ifndef O_BINARY #define O_BINARY 0 #endif #define BLOCKSZ (256 * 4) #define _STRINGIFY(s) #s #define STRINGIFY(s) _STRINGIFY(s) #define NELEM(x) (sizeof(x)/sizeof(*x)) extern ssize_t xgetline(char **, size_t *, FILE *); extern bool streq(const char *, const char *); extern char *strlwr(char *); extern void dumpmem(char *, int); extern uint16_t read16le(int); |
︙ | ︙ | |||
36 37 38 39 40 41 42 | extern char *read_virt_string_fd(int, unsigned int, int); extern uint64_t load_byte(uint64_t, int, int); extern uint64_t deposit_byte(uint64_t, int, int, uint64_t); extern uint32_t ldb(int, uint32_t); extern uint32_t dpb(uint32_t, int, uint32_t); | | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 | extern char *read_virt_string_fd(int, unsigned int, int); extern uint64_t load_byte(uint64_t, int, int); extern uint64_t deposit_byte(uint64_t, int, int, uint64_t); extern uint32_t ldb(int, uint32_t); extern uint32_t dpb(uint32_t, int, uint32_t); extern uint32_t bit_test(uint32_t, uint32_t); extern bool ldb_test(int, uint32_t); extern void dump_write_header(int, uint32_t, uint32_t); extern void dump_write_data(int, ssize_t, void *); extern void dump_write_segment(int, uint32_t, uint32_t, uint32_t *); extern void dump_write_value(int, uint32_t, uint32_t); extern int32_t dump_find_segment(int, uint32_t); extern int32_t dump_read_segment_single_value(int, uint32_t); |
Changes to mouse.c.
︙ | ︙ | |||
54 55 56 57 58 59 60 | void mouse_poll(void) { static int prevstate; int state; enum | < | < < < < | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | void mouse_poll(void) { static int prevstate; int state; enum { Sdisabled, Sopen, Soff, Son }; state = DTP_FIX_VAL(amem[a_mouse_cursor_state]); if (state != prevstate && state == Son) { is_mouse_warp = 1; mouse_warp_x = DTP_FIX_VAL(amem[a_mouse_x]); mouse_warp_y = DTP_FIX_VAL(amem[a_mouse_y]); } |
︙ | ︙ |
Deleted notes.text.
|
| < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < |
Name change from sdl.c to sdl1.c.
|
| | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 | /* sdl1.c --- SDL1 routines used by the TV and KBD interfaces */ #include <signal.h> #include <stdbool.h> #include <SDL.h> #include "tv.h" #include "kbd.h" #include "cadet.h" #include "knight.h" #include "mouse.h" #include "utrace.h" #include "idle.h" #include "misc.h" SDL_Surface *screen; #include <X11/keysym.h> // for XK_FOO meh #include <X11/X.h> // for FOOMapIndex meh static void sdl1_cleanup(void) { SDL_Quit(); } /* * Returns the X11 modifier index of KEYCODE, or -1 if not found. */ static int sdl1_bucky(SDL_KeyboardEvent e) { int mod = SDL_GetModState(); if (mod & KMOD_CTRL && (e.keysym.sym == SDLK_LCTRL || e.keysym.sym == SDLK_RCTRL)) return ControlMapIndex; if (mod & KMOD_SHIFT && (e.keysym.sym == SDLK_LSHIFT || e.keysym.sym == SDLK_RSHIFT)) return ShiftMapIndex; if (mod & KMOD_ALT && (e.keysym.sym == SDLK_LALT || e.keysym.sym == SDLK_RALT)) return Mod1MapIndex; // if (mod & KMOD_NUM) return Mod2MapIndex; // if (mod & KMOD_MODE) return Mod3MapIndex; // if (mod & KMOD_GUI && (e.keysym.sym == SDLK_LGUI || e.keysym.sym == SDLK_RGUI)) return Mod4MapIndex; // if (mod & KMOD_SCROLL) return Mod5MapIndex; return -1; } static int sdl1_keysym_to_xk(SDL_KeyboardEvent e) { /* *INDENT-OFF* */ switch (e.keysym.sym) { case SDLK_ESCAPE: return XK_Escape; case SDLK_F1: return XK_F1; case SDLK_F2: return XK_F2; case SDLK_F3: return XK_F3; case SDLK_F4: return XK_F4; case SDLK_F5: return XK_F5; case SDLK_F6: return XK_F6; case SDLK_F7: return XK_F7; case SDLK_PAGEUP: return XK_Page_Up; case SDLK_PAGEDOWN: return XK_Page_Down; case SDLK_HOME: return XK_Home; case SDLK_END: return XK_End; case SDLK_LEFT: return XK_Left; case SDLK_RIGHT: return XK_Right; case SDLK_UP: return XK_Up; case SDLK_DOWN: return XK_Down; case SDLK_BACKQUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_asciitilde : XK_grave; case SDLK_1: return e.keysym.mod & KMOD_SHIFT ? XK_exclam : XK_1; case SDLK_2: return e.keysym.mod & KMOD_SHIFT ? XK_at : XK_2; case SDLK_3: return e.keysym.mod & KMOD_SHIFT ? XK_numbersign : XK_3; case SDLK_4: return e.keysym.mod & KMOD_SHIFT ? XK_dollar : XK_4; case SDLK_5: return e.keysym.mod & KMOD_SHIFT ? XK_percent : XK_5; case SDLK_6: return e.keysym.mod & KMOD_SHIFT ? XK_asciicircum : XK_6; case SDLK_7: return e.keysym.mod & KMOD_SHIFT ? XK_ampersand : XK_7; case SDLK_8: return e.keysym.mod & KMOD_SHIFT ? XK_asterisk : XK_8; case SDLK_9: return e.keysym.mod & KMOD_SHIFT ? XK_parenleft : XK_9; case SDLK_0: return e.keysym.mod & KMOD_SHIFT ? XK_parenright : XK_0; case SDLK_MINUS: return e.keysym.mod & KMOD_SHIFT ? XK_underscore : XK_minus; case SDLK_EQUALS: return e.keysym.mod & KMOD_SHIFT ? XK_plus : XK_equal; case SDLK_TAB: return XK_Tab; case SDLK_q: return e.keysym.mod & KMOD_SHIFT ? XK_Q : XK_q; case SDLK_w: return e.keysym.mod & KMOD_SHIFT ? XK_W : XK_w; case SDLK_e: return e.keysym.mod & KMOD_SHIFT ? XK_E : XK_e; case SDLK_r: return e.keysym.mod & KMOD_SHIFT ? XK_R : XK_r; case SDLK_t: return e.keysym.mod & KMOD_SHIFT ? XK_T : XK_t; case SDLK_y: return e.keysym.mod & KMOD_SHIFT ? XK_Y : XK_y; case SDLK_u: return e.keysym.mod & KMOD_SHIFT ? XK_U : XK_u; case SDLK_i: return e.keysym.mod & KMOD_SHIFT ? XK_I : XK_i; case SDLK_o: return e.keysym.mod & KMOD_SHIFT ? XK_O : XK_o; case SDLK_p: return e.keysym.mod & KMOD_SHIFT ? XK_P : XK_p; case SDLK_LEFTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceleft : XK_bracketleft; case SDLK_RIGHTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceright : XK_bracketright; case SDLK_BACKSLASH: return e.keysym.mod & KMOD_SHIFT ? XK_bar : XK_backslash; case SDLK_BACKSPACE: return XK_BackSpace; case SDLK_a: return e.keysym.mod & KMOD_SHIFT ? XK_A : XK_a; case SDLK_s: return e.keysym.mod & KMOD_SHIFT ? XK_S : XK_s; case SDLK_d: return e.keysym.mod & KMOD_SHIFT ? XK_D : XK_d; case SDLK_f: return e.keysym.mod & KMOD_SHIFT ? XK_F : XK_f; case SDLK_g: return e.keysym.mod & KMOD_SHIFT ? XK_G : XK_g; case SDLK_h: return e.keysym.mod & KMOD_SHIFT ? XK_H : XK_h; case SDLK_j: return e.keysym.mod & KMOD_SHIFT ? XK_J : XK_j; case SDLK_k: return e.keysym.mod & KMOD_SHIFT ? XK_K : XK_k; case SDLK_l: return e.keysym.mod & KMOD_SHIFT ? XK_L : XK_l; case SDLK_SEMICOLON: return e.keysym.mod & KMOD_SHIFT ? XK_colon : XK_semicolon; case SDLK_QUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_quotedbl : XK_apostrophe; case SDLK_RETURN: return XK_Return; case SDLK_z: return e.keysym.mod & KMOD_SHIFT ? XK_Z : XK_z; case SDLK_x: return e.keysym.mod & KMOD_SHIFT ? XK_X : XK_x; case SDLK_c: return e.keysym.mod & KMOD_SHIFT ? XK_C : XK_c; case SDLK_v: return e.keysym.mod & KMOD_SHIFT ? XK_V : XK_v; case SDLK_b: return e.keysym.mod & KMOD_SHIFT ? XK_B : XK_b; case SDLK_n: return e.keysym.mod & KMOD_SHIFT ? XK_N : XK_n; case SDLK_m: return e.keysym.mod & KMOD_SHIFT ? XK_M : XK_m; case SDLK_COMMA: return e.keysym.mod & KMOD_SHIFT ? XK_less : XK_comma; case SDLK_PERIOD: return e.keysym.mod & KMOD_SHIFT ? XK_greater : XK_period; case SDLK_SLASH: return e.keysym.mod & KMOD_SHIFT ? XK_question : XK_slash; case SDLK_SPACE: return XK_space; // case SDLK_MODE: return ???; case SDLK_LSHIFT: return XK_Shift_L; case SDLK_RSHIFT: return XK_Shift_R; case SDLK_LCTRL: return XK_Control_L; case SDLK_RCTRL: return XK_Control_R; case SDLK_CAPSLOCK: return XK_Caps_Lock; // case ???: return XK_Shift_Lock; // case SDLK_LGUI: return XK_Meta_L; // case SDLK_RGUI: return XK_Meta_R; case SDLK_LALT: return XK_Alt_L; case SDLK_RALT: return XK_Alt_R; // case SDLK_LSUPER: return XK_Super_L; // case SDLK_RSUPER: return XK_Super_R; // case SDLK_LHYPER: return XK_Hyper_L; // case SDLK_RHYPER: return XK_Hyper_R; default: return XK_VoidSymbol; } /* *INDENT-ON* */ } bool cadet_allup_key(void) { bool allup; int mods; int shifts; int statesize; Uint8 *state; allup = true; mods = 0; shifts = 0; state = SDL_GetKeyState(&statesize); for (int i = 0; allup && i < statesize; i++) { int bucky; if (state[i] != 1) continue; bucky = -1; // This needs to be cleaned up -- translates scancode to bucky xk/index switch (i) { case SDLK_LSHIFT: case SDLK_RSHIFT: bucky = kbd_modifier_map[ShiftMapIndex]; break; case SDLK_LCTRL: case SDLK_RCTRL: bucky = kbd_modifier_map[ControlMapIndex]; break; case SDLK_LALT: case SDLK_RALT: bucky = kbd_modifier_map[Mod1MapIndex]; break; // case SDLK_LGUI: case SDLK_RGUI: bucky = kbd_modifier_map[Mod4MapIndex]; break; // case SDLK_LSUPER: case SDLK_RSUPER: // case SDLK_MODE: bucky = kbd_modifier_map[Mod5MapIndex]; break; // case SDLK_MENU: bucky = kbd_modifier_map[KBD_NoSymbol]; break; // case SDLK_COMPOSE: bucky = kbd_modifier_map[]; break; case SDLK_CAPSLOCK:bucky = kbd_modifier_map[LockMapIndex]; break; } DEBUG(TRACE_KBD, "cadet_allup_key() - bucky pressed (%d), i = %d\n", bucky, i); cadet_press_bucky(bucky, &mods, &shifts); } if (allup == true) { DEBUG(TRACE_KBD, "cadet_allup_key() - all-up event; mods = 0%o, shifts = 0%o\n", mods, shifts); cadet_shifts = shifts; cadet_allup_event(mods); } return allup; } /* * Takes E, converts it into a LM (hardware) keycode and sends it to * the IOB KBD. */ static void process_key(SDL_KeyboardEvent e, int keydown) { // KeySym keysym; // SDLKey keycode; int keysym; int bi; unsigned char buf[5]; idle_keyboard_activity(); keysym = sdl1_keysym_to_xk(e); if (keysym == XK_VoidSymbol || keysym > NELEM(kbd_map)) { NOTICE(TRACE_USIM, "kbd (cadet@sdl1): unable to translate to keysym (keysym = 0%o, 0%o)\n", keysym, e.keysym.sym); return; } if (kbd_type == 0) { if (!keydown) return; bi = 0; // if (e->xkey.state & ShiftMask) // knight_process_bucky(ShiftMapIndex, &bi); // if (e->xkey.state & LockMask) // knight_process_bucky(LockMapIndex, &bi); // if (e->xkey.state & ControlMask) // knight_process_bucky(ControlMapIndex, &bi); // if (e->xkey.state & Mod1Mask) // knight_process_bucky(Mod1MapIndex, &bi); // if (e->xkey.state & Mod2Mask) // knight_process_bucky(Mod2MapIndex, &bi); // if (e->xkey.state & Mod3Mask) // knight_process_bucky(Mod3MapIndex, &bi); // if (e->xkey.state & Mod4Mask) // knight_process_bucky(Mod4MapIndex, &bi); // if (e->xkey.state & Mod5Mask) // knight_process_bucky(Mod5MapIndex, &bi); knight_process_key(e.keysym.sym, bi, keydown); } else { bi = sdl1_bucky(e); cadet_process_key(keysym /* xk_keysym */ , bi, keydown, &cadet_allup_key); } } void update(int u_minh, int u_minv, int hs, int vs) { SDL_UpdateRect(screen, u_minh, u_minv, hs, vs); } void sdl1_event(void) { SDL_Event ev; tv_update_screen(&update); kbd_dequeue_key_event(); while (SDL_PollEvent(&ev)) { switch (ev.type) { case SDL_VIDEOEXPOSE: SDL_UpdateRect(screen, 0, 0, screen->w, screen->h); break; case SDL_KEYDOWN: process_key(ev.key, 1); break; case SDL_KEYUP: process_key(ev.key, 0); break; case SDL_MOUSEMOTION: case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: mouse_event(ev.button.x, ev.button.y, ev.button.button); break; case SDL_QUIT: exit(0); break; } } } void sdl1_beep(int v) { } void sdl1_init(void) { NOTICE(TRACE_USIM, "tv: using SDL1 backend for monitor and keyboard\n"); tv_foreground = 0xff; // White tv_background = 0x00; // Black if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_NOPARACHUTE)) { fprintf(stderr, "SDL_Init(): %s", SDL_GetError()); exit(1); } /* * We still want Ctrl-C to work - undo the SDL redirections. */ signal(SIGINT, SIG_DFL); signal(SIGQUIT, SIG_DFL); /* * Resize SDL screen to fit the TV console. */ screen = SDL_SetVideoMode(tv_width, tv_height, 8, SDL_HWSURFACE | SDL_ASYNCBLIT | SDL_HWACCEL); if (!screen) { fprintf(stderr, "Could not open SDL display\n"); exit(1); } SDL_ShowCursor(0); /* Invisible cursor. */ atexit(sdl1_cleanup); } |
Name change from sdl.h to sdl1.h.
1 | #pragma once | > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 | #pragma once #include <SDL.h> extern void sdl1_init(void); extern void sdl1_event(void); SDL_Surface *screen; /* hack */ extern void sdl1_beep(int); |
Added sdl2.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 | /* sdl2.c --- SDL2 routines used by the TV and KBD interfaces */ #include <signal.h> #include <SDL.h> #include "tv.h" #include "kbd.h" #include "cadet.h" #include "knight.h" #include "mouse.h" #include "utrace.h" #include "idle.h" #include "misc.h" #include <X11/keysym.h> // for XK_FOO meh #include <X11/X.h> // for FOOMapIndex meh SDL_Window *window; SDL_Renderer *renderer; SDL_Texture *texture; int sdl2_bucky(SDL_KeyboardEvent e) { int mod = SDL_GetModState(); if (mod & KMOD_CTRL && (e.keysym.sym == SDLK_LCTRL || e.keysym.sym == SDLK_RCTRL)) return ControlMapIndex; if (mod & KMOD_SHIFT && (e.keysym.sym == SDLK_LSHIFT || e.keysym.sym == SDLK_RSHIFT)) return ShiftMapIndex; if (mod & KMOD_ALT && (e.keysym.sym == SDLK_LALT || e.keysym.sym == SDLK_RALT)) return Mod1MapIndex; // if (mod & KMOD_NUM) return Mod2MapIndex; // if (mod & KMOD_MODE) return Mod3MapIndex; if (mod & KMOD_GUI && (e.keysym.sym == SDLK_LGUI || e.keysym.sym == SDLK_RGUI)) return Mod4MapIndex; // if (mod & KMOD_SCROLL) return Mod5MapIndex; return -1; } int sdl2_keysym_to_xk(SDL_KeyboardEvent e) { /* *INDENT-OFF* */ switch (e.keysym.sym) { case SDLK_ESCAPE: return XK_Escape; case SDLK_F1: return XK_F1; case SDLK_F2: return XK_F2; case SDLK_F3: return XK_F3; case SDLK_F4: return XK_F4; case SDLK_F5: return XK_F5; case SDLK_F6: return XK_F6; case SDLK_F7: return XK_F7; case SDLK_PAGEUP: return XK_Page_Up; case SDLK_PAGEDOWN: return XK_Page_Down; case SDLK_HOME: return XK_Home; case SDLK_END: return XK_End; case SDLK_LEFT: return XK_Left; case SDLK_RIGHT: return XK_Right; case SDLK_UP: return XK_Up; case SDLK_DOWN: return XK_Down; case SDLK_BACKQUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_asciitilde : XK_grave; case SDLK_1: return e.keysym.mod & KMOD_SHIFT ? XK_exclam : XK_1; case SDLK_2: return e.keysym.mod & KMOD_SHIFT ? XK_at : XK_2; case SDLK_3: return e.keysym.mod & KMOD_SHIFT ? XK_numbersign : XK_3; case SDLK_4: return e.keysym.mod & KMOD_SHIFT ? XK_dollar : XK_4; case SDLK_5: return e.keysym.mod & KMOD_SHIFT ? XK_percent : XK_5; case SDLK_6: return e.keysym.mod & KMOD_SHIFT ? XK_asciicircum : XK_6; case SDLK_7: return e.keysym.mod & KMOD_SHIFT ? XK_ampersand : XK_7; case SDLK_8: return e.keysym.mod & KMOD_SHIFT ? XK_asterisk : XK_8; case SDLK_9: return e.keysym.mod & KMOD_SHIFT ? XK_parenleft : XK_9; case SDLK_0: return e.keysym.mod & KMOD_SHIFT ? XK_parenright : XK_0; case SDLK_MINUS: return e.keysym.mod & KMOD_SHIFT ? XK_underscore : XK_minus; case SDLK_EQUALS: return e.keysym.mod & KMOD_SHIFT ? XK_plus : XK_equal; case SDLK_TAB: return XK_Tab; case SDLK_q: return e.keysym.mod & KMOD_SHIFT ? XK_Q : XK_q; case SDLK_w: return e.keysym.mod & KMOD_SHIFT ? XK_W : XK_w; case SDLK_e: return e.keysym.mod & KMOD_SHIFT ? XK_E : XK_e; case SDLK_r: return e.keysym.mod & KMOD_SHIFT ? XK_R : XK_r; case SDLK_t: return e.keysym.mod & KMOD_SHIFT ? XK_T : XK_t; case SDLK_y: return e.keysym.mod & KMOD_SHIFT ? XK_Y : XK_y; case SDLK_u: return e.keysym.mod & KMOD_SHIFT ? XK_U : XK_u; case SDLK_i: return e.keysym.mod & KMOD_SHIFT ? XK_I : XK_i; case SDLK_o: return e.keysym.mod & KMOD_SHIFT ? XK_O : XK_o; case SDLK_p: return e.keysym.mod & KMOD_SHIFT ? XK_P : XK_p; case SDLK_LEFTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceleft : XK_bracketleft; case SDLK_RIGHTBRACKET: return e.keysym.mod & KMOD_SHIFT ? XK_braceright : XK_bracketright; case SDLK_BACKSLASH: return e.keysym.mod & KMOD_SHIFT ? XK_bar : XK_backslash; case SDLK_BACKSPACE: return XK_BackSpace; case SDLK_a: return e.keysym.mod & KMOD_SHIFT ? XK_A : XK_a; case SDLK_s: return e.keysym.mod & KMOD_SHIFT ? XK_S : XK_s; case SDLK_d: return e.keysym.mod & KMOD_SHIFT ? XK_D : XK_d; case SDLK_f: return e.keysym.mod & KMOD_SHIFT ? XK_F : XK_f; case SDLK_g: return e.keysym.mod & KMOD_SHIFT ? XK_G : XK_g; case SDLK_h: return e.keysym.mod & KMOD_SHIFT ? XK_H : XK_h; case SDLK_j: return e.keysym.mod & KMOD_SHIFT ? XK_J : XK_j; case SDLK_k: return e.keysym.mod & KMOD_SHIFT ? XK_K : XK_k; case SDLK_l: return e.keysym.mod & KMOD_SHIFT ? XK_L : XK_l; case SDLK_SEMICOLON: return e.keysym.mod & KMOD_SHIFT ? XK_colon : XK_semicolon; case SDLK_QUOTE: return e.keysym.mod & KMOD_SHIFT ? XK_quotedbl : XK_apostrophe; case SDLK_RETURN: return XK_Return; case SDLK_z: return e.keysym.mod & KMOD_SHIFT ? XK_Z : XK_z; case SDLK_x: return e.keysym.mod & KMOD_SHIFT ? XK_X : XK_x; case SDLK_c: return e.keysym.mod & KMOD_SHIFT ? XK_C : XK_c; case SDLK_v: return e.keysym.mod & KMOD_SHIFT ? XK_V : XK_v; case SDLK_b: return e.keysym.mod & KMOD_SHIFT ? XK_B : XK_b; case SDLK_n: return e.keysym.mod & KMOD_SHIFT ? XK_N : XK_n; case SDLK_m: return e.keysym.mod & KMOD_SHIFT ? XK_M : XK_m; case SDLK_COMMA: return e.keysym.mod & KMOD_SHIFT ? XK_less : XK_comma; case SDLK_PERIOD: return e.keysym.mod & KMOD_SHIFT ? XK_greater : XK_period; case SDLK_SLASH: return e.keysym.mod & KMOD_SHIFT ? XK_question : XK_slash; case SDLK_SPACE: return XK_space; // case SDLK_MODE: return ???; case SDLK_LSHIFT: return XK_Shift_L; case SDLK_RSHIFT: return XK_Shift_R; case SDLK_LCTRL: return XK_Control_L; case SDLK_RCTRL: return XK_Control_R; case SDLK_CAPSLOCK: return XK_Caps_Lock; // case ???: return XK_Shift_Lock; case SDLK_LGUI: return XK_Meta_L; case SDLK_RGUI: return XK_Meta_R; case SDLK_LALT: return XK_Alt_L; case SDLK_RALT: return XK_Alt_R; // case SDLK_LSUPER: return XK_Super_L; // case SDLK_RSUPER: return XK_Super_R; // case SDLK_LHYPER: return XK_Hyper_L; // case SDLK_RHYPER: return XK_Hyper_R; default: return XK_VoidSymbol; } /* *INDENT-ON* */ } bool cadet_allup_key(void) { bool allup; int mods; int shifts; int statesize; Uint8 *state; allup = true; mods = 0; shifts = 0; state = SDL_GetKeyboardState(&statesize); for (int i = 0; allup && i < statesize; i++) { int bucky; if (state[i] != 1) continue; /* bucky not pressed */ bucky = -1; // This needs to be cleaned up -- translates scancode to bucky xk/index switch (SDL_GetKeyFromScancode(i)) { case SDLK_LSHIFT: case SDLK_RSHIFT: bucky = kbd_modifier_map[ShiftMapIndex]; break; case SDLK_LCTRL: case SDLK_RCTRL: bucky = kbd_modifier_map[ControlMapIndex]; break; case SDLK_LALT: case SDLK_RALT: bucky = kbd_modifier_map[Mod1MapIndex]; break; case SDLK_LGUI: case SDLK_RGUI: bucky = kbd_modifier_map[Mod4MapIndex]; break; // case SDLK_LSUPER: case SDLK_RSUPER: // case SDLK_MODE: bucky = kbd_modifier_map[Mod5MapIndex]; break; // case SDLK_MENU: bucky = kbd_modifier_map[KBD_NoSymbol]; break; // case SDLK_COMPOSE: bucky = kbd_modifier_map[]; break; case SDLK_CAPSLOCK:bucky = kbd_modifier_map[LockMapIndex]; break; } DEBUG(TRACE_KBD, "cadet_allup_key() - bucky pressed (%d), i = %d\n", bucky, i); cadet_press_bucky(bucky, &mods, &shifts); } if (allup == true) { DEBUG(TRACE_KBD, "cadet_allup_key() - all-up event; mods = 0%o, shifts = 0%o\n", mods, shifts); cadet_shifts = shifts; cadet_allup_event(mods); } return allup; } static void process_key(SDL_KeyboardEvent e, int keydown) { // KeySym keysym; // SDLKey keycode; int bi; int keysym; idle_keyboard_activity(); keysym = sdl2_keysym_to_xk(e); if (keysym == XK_VoidSymbol || keysym > NELEM(kbd_map)) { NOTICE(TRACE_USIM, "cadet@sdl2): unable to translate to keysym (keysym = 0%o)\n", keysym); return; } if (kbd_type == 0) { if (!keydown) return; bi = 0; int mod = SDL_GetModState(); if (mod & KMOD_SHIFT) knight_process_bucky(ShiftMapIndex, &bi); if (mod & KMOD_CAPS) knight_process_bucky(LockMapIndex, &bi); if (mod & KMOD_CTRL) knight_process_bucky(ControlMapIndex, &bi); // if (mod & Mod1Mask) // knight_process_bucky(Mod1MapIndex, &bi); // if (mod & Mod2Mask) // knight_process_bucky(Mod2MapIndex, &bi); // if (mod & Mod3Mask) // knight_process_bucky(Mod3MapIndex, &bi); // if (mod & Mod4Mask) // knight_process_bucky(Mod4MapIndex, &bi); // if (mod & Mod5Mask) // knight_process_bucky(Mod5MapIndex, &bi); knight_process_key(e.keysym.sym, bi, keydown); } else { bi = sdl2_bucky(e); cadet_process_key(keysym /* xk_keysym */ , bi, keydown, &cadet_allup_key); } } void update(int u_minh, int u_minv, int hs, int vs) { SDL_UpdateTexture(texture, NULL, tv_bitmap, tv_width * sizeof(Uint32)); // Flush SDL_RenderClear(renderer); SDL_RenderCopy(renderer, texture, NULL, NULL); SDL_RenderPresent(renderer); } void sdl2_event(void) { SDL_Event ev; tv_update_screen(&update); kbd_dequeue_key_event(); if (is_mouse_warp) { is_mouse_warp = 0; SDL_WarpMouseInWindow(window, mouse_warp_x, mouse_warp_y); } while (SDL_PollEvent(&ev)) { switch (ev.type) { case SDL_WINDOWEVENT: SDL_UpdateTexture(texture, NULL, tv_bitmap, tv_width * sizeof(Uint32)); // flush SDL_RenderClear(renderer); SDL_RenderCopy(renderer, texture, NULL, NULL); SDL_RenderPresent(renderer); break; case SDL_KEYDOWN: process_key(ev.key, 1); break; case SDL_KEYUP: process_key(ev.key, 0); break; case SDL_MOUSEMOTION: case SDL_MOUSEBUTTONDOWN: case SDL_MOUSEBUTTONUP: mouse_event(ev.button.x, ev.button.y, ev.button.button); break; case SDL_QUIT: exit(0); break; } } } float xbeep_volume = 1.0f; int AMPLITUDE = 28000; const int SAMPLE_RATE = 44100; int xbeep_sample_nr = 0; float xbeep_freq = 0.0f; void xbeep_audio_callback(void *user_data, Uint8 *raw_buffer, int bytes) { Sint16 *buffer = (Sint16 *) raw_buffer; int length = bytes / 2; // 2 bytes per sample for AUDIO_S16SYS float *freq = (float *) (user_data); int amp = AMPLITUDE * xbeep_volume; for (int i = 0; i < length; i++, xbeep_sample_nr++) { double time = (double) xbeep_sample_nr / (double) SAMPLE_RATE; buffer[i] = (Sint16) (amp * sin(2.0f * M_PI * (*freq) * time)); // render sine wave } } void xbeep_audio_init(void) { SDL_AudioSpec want; SDL_AudioSpec have; want.freq = SAMPLE_RATE; want.format = AUDIO_S16SYS; want.channels = 1; want.samples = 2048; want.callback = xbeep_audio_callback; want.userdata = &xbeep_freq; if (SDL_OpenAudio(&want, &have) != 0) SDL_LogError(SDL_LOG_CATEGORY_AUDIO, "Failed to open audio: %s", SDL_GetError()); if (want.format != have.format) SDL_LogError(SDL_LOG_CATEGORY_AUDIO, "Failed to get the desired AudioSpec"); SDL_PauseAudio(1); } void xbeep_audio_close(void) { SDL_CloseAudio(); } void xbeep(int halfwavelength, int duration) { xbeep_freq = 1000000.0f / (float) (halfwavelength * 2); xbeep_sample_nr = 0; SDL_PauseAudio(0); SDL_Delay(duration / 1000); SDL_PauseAudio(1); } void sdl2_beep(int v) { ///XBEEP (MISC-INST-ENTRY %BEEP) ///;;; First argument is half-wavelength, second is duration. Both are in microseconds. ///;;; M-1 has 2nd argument (duration) which is added to initial time-check ///;;; M-2 contains most recent time check ///;;; to compute quitting time ///;;; M-C contains 1st argument, the wavelength ///;;; M-4 contains the time at which the next click must be done. ///;;; Note that the 32-bit clock wraps around once an hour, we have to be careful ///;;; to compare clock values in the correct way, namely without overflow checking. extern uint32_t mmem[32]; #define DTP_FIX_VAL(x) ((x) & ((1 << 24) - 1)) #define DTP_FIX(x) (DTP_FIX_VAL(x) | 5 << 25) int wavelength = DTP_FIX_VAL(mmem[7]); //M-C M-MEM 7 int duration = DTP_FIX_VAL(mmem[22]); //M-1 M-MEM 22 xbeep(wavelength, duration); } void sdl2_init(void) { NOTICE(TRACE_USIM, "tv: using SDL2 backend for monitor and keyboard\n"); xbeep_audio_init(); SDL_CreateWindowAndRenderer(tv_width, tv_height, SDL_WINDOW_OPENGL, &window, &renderer); SDL_ShowCursor(0); /* Invisible cursor. */ // SDL_SetRenderDrawColor(renderer, 0, 0, 0, 255); // SDL_RenderClear(renderer); // SDL_RenderPresent(renderer); SDL_SetHint(SDL_HINT_RENDER_SCALE_QUALITY, "linear"); // make the scaled rendering look smoother. SDL_RenderSetLogicalSize(renderer, tv_width, tv_height); texture = SDL_CreateTexture(renderer, SDL_PIXELFORMAT_ARGB8888, SDL_TEXTUREACCESS_STREAMING, tv_width, tv_height); } |
Added sdl2.h.
> > > > > > | 1 2 3 4 5 6 | #pragma once extern void sdl2_init(void); extern void sdl2_event(void); extern void sdl2_beep(int); |
Changes to tv.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | /* tv.c --- TV interface */ #include <sys/signal.h> #include <sys/time.h> #include <err.h> #include <signal.h> #include "tv.h" #include "ucode.h" #include "utrace.h" #include "x11.h" int tv_monitor = 1; /* Default is Other (1). */ uint32_t tv_width; uint32_t tv_height; uint32_t tv_bitmap[1024 * 1024]; static int tv_csr; static int tv_colorbit; static void tv_post_60hz_interrupt(void) { tv_csr |= 1 << 4; assert_xbus_interrupt(); } static void sigalrm_handler(int arg) { tv_post_60hz_interrupt(); } void tv_screenshot(char *fn) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > < | < < < | < < < | > > > > > > < < > | > > | | | > > | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 | /* tv.c --- TV interface */ #include <sys/signal.h> #include <sys/time.h> #include <err.h> #include <signal.h> #include "tv.h" #include "ucode.h" #include "utrace.h" #if WITH_X11 #include "x11.h" #elif WITH_SDL1 #include "sdl1.h" #elif WITH_SDL2 #include "sdl2.h" #endif int tv_monitor = 1; /* Default is Other (1). */ uint32_t tv_width; uint32_t tv_height; uint32_t tv_bitmap[1024 * 1024]; static int tv_csr; static int tv_colorbit; unsigned long tv_background = 0x000000; // Black unsigned long tv_foreground = 0xffffff; // White static int u_minh = 0x7fffffff; static int u_maxh; static int u_minv = 0x7fffffff; static int u_maxv; static void accumulate_update(int h, int v, int hs, int vs) { if (h < u_minh) u_minh = h; if (h + hs > u_maxh) u_maxh = h + hs; if (v < u_minv) u_minv = v; if (v + vs > u_maxv) u_maxv = v + vs; } void tv_update_screen(void (*fn)(int, int , int , int)) { int hs; int vs; hs = u_maxh - u_minh; vs = u_maxv - u_minv; if (u_minh != 0x7fffffff && u_minv != 0x7fffffff && u_maxh && u_maxv) { (*fn)(u_minh, u_minv, hs, vs); } u_minh = 0x7fffffff; u_maxh = 0; u_minv = 0x7fffffff; u_maxv = 0; } static void tv_post_60hz_interrupt(void) { tv_csr |= 1 << 4; assert_xbus_interrupt(); } static void sigalrm_handler(int arg) { tv_post_60hz_interrupt(); } void tv_screenshot(char *fn) { char buff[128]; FILE *f; f = fopen(fn, "wb"); if (f == NULL) { warnx("failed to open: %s", fn); return; } fputs("P1\n", f); snprintf(buff, 128, "%i", tv_width); fputs(buff, f); fputc(' ', f); snprintf(buff, 128, "%i", tv_height); fputs(buff, f); fputs("\n", f); for (uint32_t i = 0; i < tv_width * tv_height; i++) { fputc(tv_bitmap[i] == tv_foreground ? '1' : '0', f); if (i % 70 == 0 && i > 0) fputc('\n', f); } fclose(f); } void tv_read(uint32_t offset, uint32_t *pv) { unsigned long bits; offset *= 32; if (offset > tv_width * tv_height) { WARNING(TRACE_TV, "tv: tv_read past end; offset %o\n", offset); *pv = 0; return; } bits = 0; for (int i = 0; i < 32; i++) { if (tv_bitmap[offset + i] == tv_foreground) bits |= 1UL << i; } *pv = bits; } void tv_flip_all(void) { uint32_t bits = 0; for (uint32_t i = 0; i < tv_width * tv_height / 32; i++) { tv_read(i, &bits); tv_write(i, ~bits); } } void tv_write(uint32_t offset, uint32_t bits) { int h; int v; offset *= 32; v = offset / tv_width; h = offset % tv_width; for (int i = 0; i < 32; i++) { tv_bitmap[offset + i] = (bits & 1) ? tv_foreground : tv_background; #if WITH_SDL1 /* HACK */ if (screen) { unsigned char *ps = screen->pixels; ps[offset + i] = (bits & 1) ? tv_foreground : tv_background; } #endif bits >>= 1; } accumulate_update(h, v, 32, 1); } void tv_xbus_read(uint32_t offset, uint32_t *pv) { *pv = tv_csr; } void tv_xbus_write(uint32_t offset, uint32_t v) { tv_csr = v; tv_csr &= ~(1 << 4); /* * Handle hardware reverse-video functionality. */ if ((v & 4) != tv_colorbit) { tv_colorbit = v & 4; { unsigned long temp = tv_foreground; tv_foreground = tv_background; tv_background = temp; } tv_colorbit = v & 4; tv_flip_all(); } deassert_xbus_interrupt(); } void tv_poll(void) { #ifdef WITH_X11 x11_event(); #elif WITH_SDL1 sdl1_event(); #elif WITH_SDL2 sdl2_event(); #endif } void tv_init(void) { tv_colorbit = 0; |
︙ | ︙ | |||
164 165 166 167 168 169 170 | break; default: errx(1, "unknown monitor type: %d", tv_monitor); break; } #ifdef WITH_X11 x11_init(); | | > > > | 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | break; default: errx(1, "unknown monitor type: %d", tv_monitor); break; } #ifdef WITH_X11 x11_init(); #elif WITH_SDL1 sdl1_init(); #elif WITH_SDL2 sdl2_init(); #endif { struct itimerval itimer; int usecs; signal(SIGVTALRM, sigalrm_handler); usecs = 16000; |
︙ | ︙ |
Changes to tv.h.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | #pragma once #include <stdint.h> extern int tv_monitor; extern uint32_t tv_bitmap[1024 * 1024]; extern uint32_t tv_width; extern uint32_t tv_height; extern void tv_init(void); extern void tv_poll(void); extern void tv_write(uint32_t, uint32_t); extern void tv_read(uint32_t, uint32_t *); extern void tv_xbus_read(uint32_t, uint32_t *); extern void tv_xbus_write(uint32_t, uint32_t); extern void tv_screenshot(char *); | > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | #pragma once #include <stdint.h> extern int tv_monitor; extern uint32_t tv_bitmap[1024 * 1024]; extern uint32_t tv_width; extern uint32_t tv_height; extern unsigned long tv_background; extern unsigned long tv_foreground; extern void tv_init(void); extern void tv_poll(void); extern void tv_write(uint32_t, uint32_t); extern void tv_read(uint32_t, uint32_t *); extern void tv_xbus_read(uint32_t, uint32_t *); extern void tv_xbus_write(uint32_t, uint32_t); extern void tv_screenshot(char *); extern void tv_update_screen(void (*fn)(int, int , int , int)); |
Changes to ucfg.c.
1 2 3 4 5 6 7 8 9 10 | /* ucfg.c --- configuration handling */ #include <err.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include <limits.h> | < < < < > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 | /* ucfg.c --- configuration handling */ #include <err.h> #include <stdbool.h> #include <stdlib.h> #include <string.h> #include <errno.h> #include <limits.h> #include "idle.h" #include "kbd.h" #include "lmch.h" #include "misc.h" #include "tv.h" #include "ucfg.h" #include "uch11.h" #include "utrace.h" #include <X11/keysym.h> // for XK_FOO meh #include <X11/X.h> // for FOOMapIndex meh #if WITH_X11 #include "x11.h" #elif WITH_SDL1 #include "sdl1.h" #elif WITH_SDL2 #include "sdl2.h" #endif #define INIHEQ(s, n) (streq(s, section) && streq(n, name)) ucfg_t ucfg = { #define X(s, n, default) default, #include "ucfg.defs" #undef X |
︙ | ︙ | |||
40 41 42 43 44 45 46 47 48 49 50 | /* * Change trace defaults; the default in trace.c is to be very * very quiet. */ trace_level = LOG_NOTICE; trace_facilities = TRACE_USIM; trace_stream = stdout; // stderr; #ifdef WITH_X11 /* * Initialize default X11 keybaord translation map. */ | > < < | 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 | /* * Change trace defaults; the default in trace.c is to be very * very quiet. */ trace_level = LOG_NOTICE; trace_facilities = TRACE_USIM; trace_stream = stdout; // stderr; kbd_default_map(); #ifdef WITH_X11 /* * Initialize default X11 keybaord translation map. */ x11_grab_keyboard = true; #endif /* * Initialize default idle values. */ idle_cycles = 0x0ffff * 10; idle_quantum = 0x0ffff; idle_timeout = 1000; |
︙ | ︙ | |||
144 145 146 147 148 149 150 | if (streq(cfg->usim_grab_keyboard, "true")) x11_grab_keyboard = true; else if (streq(cfg->usim_grab_keyboard, "false")) x11_grab_keyboard = false; else { warnx("unknown value for grab_keyboard: %s", cfg->usim_grab_keyboard); return 1; } } | | | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | if (streq(cfg->usim_grab_keyboard, "true")) x11_grab_keyboard = true; else if (streq(cfg->usim_grab_keyboard, "false")) x11_grab_keyboard = false; else { warnx("unknown value for grab_keyboard: %s", cfg->usim_grab_keyboard); return 1; } } #elif WITH_SDL1 #endif if (INIHEQ("chaos", "backend")) { if (streq(cfg->chaos_backend, "daemon")) uch11_backend = UCH11_BACKEND_DAEMON; else if (streq(cfg->chaos_backend, "local")) uch11_backend = UCH11_BACKEND_LOCAL; else if (streq(cfg->chaos_backend, "udp")) uch11_backend = UCH11_BACKEND_UDP; else { |
︙ | ︙ | |||
216 217 218 219 220 221 222 | return 1; } sp = strtok(NULL, " "); } free(s); } | < | | | | | | | | | < < | | | 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 | return 1; } sp = strtok(NULL, " "); } free(s); } if (streq(section, "kbd.modifiers") == true) { /* * ---!!! We don't differentiate between left/right on * ---!!! the Lisp Machine side. */ if (streq(value, "")) { warnx("value for %s is empty", name); return 1; } if (streq(name, "Shift")) kbd_modifier_map[ShiftMapIndex] = lmbucky(value); else if (streq(name, "Lock")) kbd_modifier_map[LockMapIndex] = lmbucky(value); else if (streq(name, "Control")) kbd_modifier_map[ControlMapIndex] = lmbucky(value); else if (streq(name, "Mod1")) kbd_modifier_map[Mod1MapIndex] = lmbucky(value); else if (streq(name, "Mod2")) kbd_modifier_map[Mod2MapIndex] = lmbucky(value); else if (streq(name, "Mod3")) kbd_modifier_map[Mod3MapIndex] = lmbucky(value); else if (streq(name, "Mod4")) kbd_modifier_map[Mod4MapIndex] = lmbucky(value); else if (streq(name, "Mod5")) kbd_modifier_map[Mod5MapIndex] = lmbucky(value); else { warnx("unknown modifier: %s", name); return 1; } } #ifdef WITH_X11 if (streq(section, "kbd") == true) { int xk; int lmchar; xk = XStringToKeysym(name); if (xk == NoSymbol) { warnx("unknown X11 key name: %s", name); return 1; } lmchar = kbd_lmchar(value); if (lmchar == LMCH_NoSymbol) { warnx("unknown lisp machine character name: %s", value); return 1; } kbd_map[xk] = lmchar; } #elif WITH_SDL1 #endif if (streq(section, "idle") == true) { if (streq(name, "cycles")) read_integer_value(name, value, &idle_cycles); else if (streq(name, "quantum")) read_integer_value(name, value, &idle_quantum); else if (streq(name, "timeout")) read_integer_value(name, value, &idle_timeout); else { |
︙ | ︙ |
Added uch11-backend.h.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 | #pragma once #include <pthread.h> #include <stdbool.h> enum { CHAOS_CSR_TIMER_INTERRUPT_ENABLE = (01 << 00), /* CHBUSY */ CHAOS_CSR_LOOP_BACK = (01 << 01), /* CHLPBK */ CHAOS_CSR_RECEIVE_ALL = (01 << 02), /* CHSPY */ CHAOS_CSR_RECEIVER_CLEAR = (01 << 03), CHAOS_CSR_RECEIVE_ENABLE = (01 << 04), /* CHREN */ CHAOS_CSR_TRANSMIT_ENABLE = (01 << 05), /* CHRIEN */ CHAOS_CSR_INTERRUPT_ENABLES = (02 << 04), CHAOS_CSR_TRANSMIT_ABORT = (01 << 06), /* CHABRT */ CHAOS_CSR_TRANSMIT_DONE = (01 << 07), /* CHTDN */ CHAOS_CSR_TRANSMITTER_CLEAR = (01 << 010), /* CHTCLR */ CHAOS_CSR_LOST_COUNT = (04 << 011), /* CHLC */ CHAOS_CSR_RESET = (01 << 015), /* CHRST */ CHAOS_CSR_CRC_ERROR = (01 << 016), /* CHCRC */ CHAOS_CSR_RECEIVE_DONE = (01 << 017), /* CHRDN */ } CHAOS_HARDWARE_VALUES; extern struct queue_head queuehead; extern pthread_mutex_t recvqueue; extern pthread_mutex_t recvqueue; extern int chaosd_fd; extern int uch11_backend; extern int uch11_myaddr; extern int uch11_serveraddr; extern bool reconnect_chaos; extern int uch11_csr; extern int uch11_bit_count; extern int uch11_lost_count; extern unsigned short uch11_xmit_buffer[4096]; extern int uch11_xmit_buffer_size; extern int uch11_xmit_buffer_ptr; extern unsigned short uch11_rcv_buffer[4096]; extern unsigned short uch11_rcv_buffer_toss[4096]; extern int uch11_rcv_buffer_ptr; extern int uch11_rcv_buffer_size; extern bool uch11_rcv_buffer_empty; // This hack is so that uch11-backend.h (this file) can be included in // Chaosnet for Unix. #ifndef CHAOS_H #define CHAOS_H #include <pthread.h> #include <sys/queue.h> struct packet_queue { TAILQ_ENTRY(packet_queue) next; struct packet *packet; }; TAILQ_HEAD(queue_head, packet_queue); #include "chaos.h" #include "chunix/chsys.h" #include "chunix/chconf.h" #include "chncp/chncp.h" #endif |
Added uch11-chaosd.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 | /* Connect to a chaos daemon via a Unix socket. */ #include <sys/poll.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> #include <sys/uio.h> #include <sys/un.h> #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> #include <arpa/inet.h> #include <err.h> #include <pthread.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> #include "uch11.h" #include "uch11-backend.h" #include "chaosd.h" #include "hosttab.h" #include "misc.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" #define UNIX_SOCKET_PATH "/var/tmp/" #define UNIX_SOCKET_CLIENT_NAME "chaosd_" #define UNIX_SOCKET_SERVER_NAME "chaosd_server" #define UNIX_SOCKET_PERM S_IRWXU int chaos_send_to_chaosd(char *buffer, int size) { int wcount, dest_addr; /* * Local loopback. */ if (uch11_csr & CHAOS_CSR_LOOP_BACK) { DEBUG(TRACE_CHAOS, "chaos: loopback %d bytes\n", size); memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); return 0; } wcount = (size + 1) / 2; dest_addr = ((unsigned short *) buffer)[wcount - 3]; DEBUG(TRACE_CHAOS, "chaos: sending packet to chaosd (dest_addr=%o, uch11_myaddr=%o, size %d, wcount %d)\n", dest_addr, uch11_myaddr, size, wcount); /* * Recieve packets addressed to us, but don't receive broadcasts we send */ if (dest_addr == uch11_myaddr) { memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); } if (chaosd_fd == -1) return 0; { struct iovec iov[2]; unsigned char lenbytes[4]; int ret; lenbytes[0] = size >> 8; lenbytes[1] = size; lenbytes[2] = 1; lenbytes[3] = 0; iov[0].iov_base = lenbytes; iov[0].iov_len = 4; iov[1].iov_base = buffer; iov[1].iov_len = size; ret = writev(chaosd_fd, iov, 2); if (ret < 0) { perror("chaos write"); return -1; } } return 0; } int chaos_poll_chaosd(void) { ssize_t ret; struct pollfd pfd[1]; int nfds, timeout; unsigned char lenbytes[4]; ssize_t len; int dest_addr; if (reconnect_chaos == true) { uch11_reconnect(); } if (chaosd_fd == -1) { return 0; } timeout = 0; nfds = 1; pfd[0].fd = chaosd_fd; pfd[0].events = POLLIN; pfd[0].revents = 0; ret = poll(pfd, nfds, timeout); if (ret == -1) { ERR(TRACE_CHAOS, "chaos: polling chaosd: nothing there (RDN=%o)\n", uch11_csr & CHAOS_CSR_RECEIVE_DONE); reconnect_chaos = true; return -1; } else if (ret == 0) { ERR(TRACE_CHAOS, "chaos: timeout\n"); return -1; } /* * Is RX buffer full? */ if (!uch11_rcv_buffer_empty && (uch11_csr & CHAOS_CSR_RECEIVE_DONE)) { /* * Toss packets arriving when buffer is already in * use, they will be resent. */ ERR(TRACE_CHAOS, "chaos: polling chaosd: unread data, drop (RDN=%o, lost %d)\n", uch11_csr & CHAOS_CSR_RECEIVE_DONE, uch11_lost_count); uch11_lost_count++; ret = read(chaosd_fd, lenbytes, 4); if (ret != 4) perror("read"); len = (lenbytes[0] << 8) | lenbytes[1]; DEBUG(TRACE_CHAOS, "chaos: tossing packet of %d bytes\n", len); if (len > (ssize_t) sizeof(uch11_rcv_buffer_toss)) { ERR(TRACE_CHAOS, "chaos: packet won't fit (len=%d)", len); uch11_force_reconect(); return -1; } /* * Toss it... */ ret = read(chaosd_fd, (char *) uch11_rcv_buffer_toss, len); if (ret != len) perror("read"); return -1; } /* * Read header from chaosd. */ ret = read(chaosd_fd, lenbytes, 4); if (ret <= 0) { perror("chaos: header read error"); uch11_force_reconect(); return -1; } len = (lenbytes[0] << 8) | lenbytes[1]; if (len > (ssize_t) sizeof(uch11_rcv_buffer)) { ERR(TRACE_CHAOS, "chaos: packet too big: pkt size %d, buffer size %lu\n", len, sizeof(uch11_rcv_buffer)); /* * When we get out of synch break socket conn. */ uch11_force_reconect(); return -1; } ret = read(chaosd_fd, (char *) uch11_rcv_buffer, len); if (ret == -1) { perror("chaos: read"); uch11_force_reconect(); return -1; } else if (ret == 0) { ERR(TRACE_CHAOS, "chaos: read zero bytes\n"); return -1; } DEBUG(TRACE_CHAOS, "chaos: polling; got chaosd packet %d\n", ret); uch11_rcv_buffer_size = (ret + 1) / 2; uch11_rcv_buffer_empty = false; dest_addr = uch11_rcv_buffer[uch11_rcv_buffer_size - 3]; /* * If not to us, ignore. */ if (dest_addr != uch11_myaddr) { DEBUG(TRACE_CHAOS, "chaos: ignoring packet not to us (%o): %o\n", uch11_myaddr, dest_addr); uch11_rcv_buffer_size = 0; uch11_rcv_buffer_empty = true; /* * Should uch11_rx_pkt be called here? */ return 0; } DEBUG(TRACE_CHAOS, "chaos: recieving packet: from %o, my %o\n", dest_addr, uch11_myaddr); uch11_rx_pkt(); return 0; } |
Added uch11-local.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 | /* Local Chaos -- this should go into chlib.c */ #include <sys/poll.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> #include <sys/uio.h> #include <sys/un.h> #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> #include <arpa/inet.h> #include <err.h> #include <pthread.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> #include "uch11.h" #include "uch11-backend.h" #include "chaosd.h" #include "hosttab.h" #include "misc.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" static void chaos_queue(struct packet *packet) { struct packet_queue *node; node = malloc(sizeof(struct packet_queue)); node->packet = packet; pthread_mutex_lock(&recvqueue); TAILQ_INSERT_TAIL(&queuehead, node, next); pthread_mutex_unlock(&recvqueue); } int chaos_connection_queue(struct connection *conn, struct packet *packet) { struct packet_queue *node; unsigned short nextpacket; INFO(TRACE_CHAOS, "chaos: sending packet (0%o) to 0%o from 0%o (length: %d)\n", packet->pk_op, CH_ADDR_SHORT(packet->pk_daddr), CH_ADDR_SHORT(packet->pk_saddr), PH_LEN(packet->pk_phead)); if (trace_level == LOG_DEBUG && (trace_facilities & TRACE_CHAOS)) { dumpmem(packet->pk_cdata, PH_LEN(packet->pk_phead)); } /* * Any packet for remote gets queued. */ if (CH_ADDR_SHORT(packet->pk_daddr) == CH_ADDR_SHORT(conn->cn_faddr)) { for (;;) { if (chtfull(conn) && packet->pk_op != STSOP) { struct timespec ts; DEBUG(TRACE_CHAOS, "chaos: waiting for remote ack packet=%d (cn_tlast = %d cn_tacked = %d twsize = %d)\n", packet->pk_pkn, conn->cn_tlast, conn->cn_tacked, conn->cn_twsize); pthread_mutex_lock(&conn->twsem); clock_gettime(CLOCK_REALTIME, &ts); ts.tv_sec += 5; if (pthread_cond_timedwait(&conn->twcond, &conn->twsem, &ts)) { if (conn->lastpacket) { struct packet *retransmit; DEBUG(TRACE_CHAOS, "chaos: re-transmit last packet\n"); retransmit = conn->lastpacket; conn->lastpacket = 0; chaos_queue(retransmit); } } pthread_mutex_unlock(&conn->twsem); } else break; } if (packet->pk_op != STSOP && CH_INDEX_SHORT(packet->pk_didx) == CH_INDEX_SHORT(conn->cn_fidx) && cmp_gt(packet->pk_pkn, conn->cn_tlast)) conn->cn_tlast = packet->pk_pkn; conn->lastpacket = packet; chaos_queue(packet); return 0; } node = malloc(sizeof(struct packet_queue)); node->packet = packet; nextpacket = conn->cn_rlast + 1; if (cmp_gt(packet->pk_pkn, nextpacket)) { DEBUG(TRACE_CHAOS, "chaos: queuing out-of-order packet: nextpacket=%d packet=%d\n", nextpacket, packet->pk_pkn); pthread_mutex_lock(&conn->queuelock); TAILQ_INSERT_TAIL(&conn->orderhead, node, next); pthread_mutex_unlock(&conn->queuelock); return 0; } { pthread_mutex_lock(&conn->queuelock); TAILQ_INSERT_TAIL(&conn->queuehead, node, next); pthread_mutex_unlock(&conn->queuelock); } pthread_mutex_lock(&conn->queuesem); pthread_cond_signal(&conn->queuecond); pthread_mutex_unlock(&conn->queuesem); return 0; } struct packet * chaos_connection_dequeue(struct connection *conn) { struct packet *packet; struct packet_queue *node; #if 0 unsigned short nextpacket; #endif packet = NOPKT; node = 0; #if 0 nextpacket = conn->cn_rlast + 1; #endif if (conn->cn_state == CSCLOSED) return NOPKT; for (;;) { pthread_mutex_lock(&conn->queuelock); if (TAILQ_EMPTY(&conn->orderhead) == false) { #if 0 struct packet_queue *prev; for (node = conn->orderhead; node; prev = node, node = node->next) if (node->packet->pk_pkn == nextpacket) { if (prev == 0) conn->orderhead = node->next; else prev->next = node->next; if (conn->ordertail == node) conn->ordertail = prev; packet = node->packet; break; } #endif #if 0 TAILQ_FOREACH(node, &conn->orderhead, next) { if (node->packet->pk_pkn == nextpacket) { DEBUG(TRACE_CHAOS, "chaos: dequeued out-of-order packet %d\n", nextpacket); /* * ---!! magic */ break; } } #else DEBUG(TRACE_CHAOS, "chaos: ordered queue empty\n"); #endif } if (node == 0 && TAILQ_EMPTY(&conn->queuehead) == false) { node = TAILQ_FIRST(&conn->queuehead); packet = node->packet; TAILQ_REMOVE(&conn->queuehead, node, next); } pthread_mutex_unlock(&conn->queuelock); if (node) { free(node); node = 0; } if (packet) { if (cmp_gt(packet->pk_pkn, conn->cn_rlast)) conn->cn_rlast = packet->pk_pkn; conn->cn_tacked = packet->pk_ackn; if (3 * (short) (conn->cn_rlast - conn->cn_racked) > conn->cn_rwsize) { struct packet *status; status = chaos_allocate_packet(conn, STSOP, 2 * sizeof(unsigned short)); conn->cn_racked = conn->cn_rlast; *(unsigned short *) &status->pk_cdata[0] = conn->cn_rlast; *(unsigned short *) &status->pk_cdata[2] = conn->cn_rwsize; chaos_queue(status); } return packet; } pthread_mutex_lock(&conn->queuesem); pthread_cond_wait(&conn->queuecond, &conn->queuesem); pthread_mutex_unlock(&conn->queuesem); if (conn->cn_state == CSCLOSED) return NOPKT; } } static int chaos_queue_time_pkt(unsigned short saddr, unsigned short sidx) { time_t t; struct timeval time; struct packet *answer; INFO(TRACE_CHAOS, "chaos: RFC (TIME): answering...\n"); gettimeofday(&time, NULL); t = time.tv_sec; t += 60UL * 60 * 24 * ((1970 - 1900) * 365L + 1970 / 4 - 1900 / 4); answer = pkalloc(sizeof(long), 0); answer->pk_op = ANSOP; SET_PH_LEN(answer->pk_phead, sizeof(long)); SET_CH_ADDR(answer->pk_daddr, saddr); SET_CH_INDEX(answer->pk_didx, sidx); SET_CH_ADDR(answer->pk_saddr, chaos_addr(ucfg.chaos_servername, 0)); SET_CH_INDEX(answer->pk_sidx, 0); answer->pk_pkn = 0; answer->pk_ackn = 0; *(long *) &answer->pk_cdata[0] = t; chaos_queue(answer); return 0; } static int chaos_queue_uptime_pkt(unsigned short saddr, unsigned short sidx) { struct packet *answer; INFO(TRACE_CHAOS, "chaos: RFC (UPTIME): answering...\n"); answer = pkalloc(sizeof(long), 0); answer->pk_op = ANSOP; SET_PH_LEN(answer->pk_phead, sizeof(long)); SET_CH_ADDR(answer->pk_daddr, saddr); SET_CH_INDEX(answer->pk_didx, sidx); SET_CH_ADDR(answer->pk_saddr, chaos_addr(ucfg.chaos_servername, 0)); SET_CH_INDEX(answer->pk_sidx, 0); answer->pk_pkn = 0; answer->pk_ackn = 0; *(long *) &answer->pk_cdata[0] = 0; chaos_queue(answer); return 0; } static int chaos_queue_status_pkt(unsigned short saddr, unsigned short sidx) { struct packet *answer; struct status *status; INFO(TRACE_CHAOS, "chaos: RFC (STATUS): answering...\n"); answer = pkalloc(CHSTATNAME + 2 * 2, 0); /* Only room for name and subnet+nwords */ answer->pk_op = ANSOP; SET_PH_LEN(answer->pk_phead, CHSTATNAME + 2 * 2); SET_CH_ADDR(answer->pk_daddr, saddr); SET_CH_INDEX(answer->pk_didx, sidx); SET_CH_ADDR(answer->pk_saddr, chaos_addr(ucfg.chaos_servername, 0)); SET_CH_INDEX(answer->pk_sidx, 0); answer->pk_pkn = 0; answer->pk_ackn = 0; status = (struct status *) &answer->pk_cdata[0]; memset(status, 0, sizeof(struct status)); strncpy(status->sb_name, ucfg.chaos_servername, CHSTATNAME); status->sb_name[CHSTATNAME - 1] = '\0'; /* Only put in the subnet (with the 400 marker) */ status->sb_data->sb_ident = (chaos_addr(ucfg.chaos_servername, 0) >> 8) | 0400; /* and say no data is following */ status->sb_data->sb_nshorts = 0 * sizeof(int) / sizeof(short); chaos_queue(answer); return 0; } static int chaos_queue_file_pkt(struct packet *packet) { void processdata(struct connection *conn); struct packet *answer; struct connection *conn; packet->pk_cdata[PH_LEN(packet->pk_phead)] = '\0'; INFO(TRACE_CHAOS, "chaos: RFC (%s): answering...\n", &packet->pk_cdata); conn = allconn(); conn->cn_faddr = packet->pk_saddr; conn->cn_fidx = packet->pk_sidx; answer = chaos_allocate_packet(conn, OPNOP, 2 * sizeof(unsigned short)); answer->pk_ackn = packet->pk_pkn; conn->cn_racked = packet->pk_pkn; *(unsigned short *) &answer->pk_cdata[0] = packet->pk_pkn; /* Last packed received. */ *(unsigned short *) &answer->pk_cdata[2] = conn->cn_rwsize; chaos_connection_queue(conn, answer); conn->cn_state = CSLISTEN; processdata(conn); return 0; } static int chaos_queue_mini_pkt(struct packet *packet) { void processmini(struct connection *conn); struct packet *answer; struct connection *conn; packet->pk_cdata[PH_LEN(packet->pk_phead)] = '\0'; INFO(TRACE_CHAOS, "chaos: RFC (%s): answering...\n", &packet->pk_cdata); conn = allconn(); conn->cn_faddr = packet->pk_saddr; conn->cn_fidx = packet->pk_sidx; answer = chaos_allocate_packet(conn, OPNOP, 2 * sizeof(unsigned short)); answer->pk_ackn = packet->pk_pkn; conn->cn_racked = packet->pk_pkn; *(unsigned short *) &answer->pk_cdata[0] = packet->pk_pkn; /* Last packed received. */ *(unsigned short *) &answer->pk_cdata[2] = conn->cn_rwsize; chaos_connection_queue(conn, answer); conn->cn_state = CSLISTEN; conn->cn_rlast = 1; processmini(conn); return 0; } int chaos_send_to_local(char *buffer, int size) { /* ---!!! rcvpkt ? */ struct packet *packet; struct connection *conn; packet = (struct packet *) buffer; /* * Local loopback. */ if (uch11_csr & CHAOS_CSR_LOOP_BACK) { DEBUG(TRACE_CHAOS, "chaos: loopback %d bytes\n", size); memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); return 0; } DEBUG(TRACE_CHAOS, "chaos: transmitting packet (dest_addr = %o, uch11_myaddr=%o, size %d, wcount %d, op: %o)\n", CH_ADDR_SHORT(packet->pk_daddr), uch11_myaddr, size, (size + 1) / 2, packet->pk_op); /* * Receive packets addressed to ourselves. */ if (CH_ADDR_SHORT(packet->pk_daddr) == uch11_myaddr) { memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); } /* * Ignore packets anything that isn't addressed to us. */ if (CH_ADDR_SHORT(packet->pk_daddr) != chaos_addr(ucfg.chaos_servername, 0)) { DEBUG(TRACE_CHAOS, "chaos: ignoring packet not to us (%o): %o\n", chaos_addr(ucfg.chaos_servername, 0), CH_ADDR_SHORT(packet->pk_daddr)); return 0; } conn = chaos_find_connection(CH_INDEX_SHORT(packet->pk_didx)); /* * ---!!! Large parts of this is in rcvrfc. */ if (packet->pk_op == RFCOP) { DEBUG(TRACE_CHAOS, "chaos: got RFC packet\n"); if (conn && conn->cn_state == CSLISTEN) { DEBUG(TRACE_CHAOS, "chaos: duplicate RFC\n"); return 0; } if (conn) { struct packet *pkt; pkt = pkalloc((size_t) size, 0); memcpy(pkt, packet, size); chaos_connection_queue(conn, pkt); return 0; } if (memcmp(&packet->pk_cdata, "STATUS", 6) == 0) return chaos_queue_status_pkt(CH_ADDR_SHORT(packet->pk_saddr), CH_INDEX_SHORT(packet->pk_sidx)); else if (memcmp(&packet->pk_cdata, "TIME", 4) == 0) return chaos_queue_time_pkt(CH_ADDR_SHORT(packet->pk_saddr), CH_INDEX_SHORT(packet->pk_sidx)); else if (memcmp(&packet->pk_cdata, "UPTIME", 6) == 0) return chaos_queue_uptime_pkt(CH_ADDR_SHORT(packet->pk_saddr), CH_INDEX_SHORT(packet->pk_sidx)); else if (memcmp(&packet->pk_cdata, "FILE", 4) == 0) return chaos_queue_file_pkt(packet); else if (memcmp(&packet->pk_cdata, "MINI", 4) == 0) return chaos_queue_mini_pkt(packet); else { char buffer[512]; strncpy(buffer, (char *) packet->pk_cdata, PH_LEN(packet->pk_phead)); buffer[PH_LEN(packet->pk_phead)] = '\0'; WARNING(TRACE_CHAOS, "chaos: RFC (%s): protocol not implemented\n", buffer); return 0; } } if (packet->pk_op == SNSOP && conn) { struct packet *sts; sts = pkalloc(2 * sizeof(unsigned short) + 3 * sizeof(unsigned short), 1); sts->pk_op = STSOP; SET_PH_LEN(sts->pk_phead, 2 * sizeof(unsigned short)); sts->pk_daddr = packet->pk_saddr; sts->pk_didx = packet->pk_sidx; conn->cn_faddr = packet->pk_saddr; conn->cn_fidx = packet->pk_sidx; sts->pk_saddr = conn->cn_laddr; sts->pk_sidx = conn->cn_lidx; sts->pk_pkn = packet->pk_pkn; if (cmp_gt(packet->pk_ackn, conn->cn_tacked)) conn->cn_tacked = packet->pk_ackn; sts->pk_ackn = conn->cn_racked; *(unsigned short *) &sts->pk_cdata[0] = conn->cn_racked; *(unsigned short *) &sts->pk_cdata[2] = conn->cn_rwsize; chaos_connection_queue(conn, sts); return 0; } if (packet->pk_op == STSOP) { if (conn) { if (cmp_gt(packet->pk_ackn, conn->cn_tacked)) conn->cn_tacked = packet->pk_ackn; if (conn->lastpacket && conn->cn_tacked == conn->lastpacket->pk_pkn) { free(conn->lastpacket); conn->lastpacket = 0; } conn->cn_state = CSOPEN; conn->cn_twsize = *(unsigned short *) &packet->pk_cdata[2]; DEBUG(TRACE_CHAOS, "chaos: STSOP: twsize = %d\n", conn->cn_twsize); pthread_mutex_lock(&conn->twsem); pthread_cond_signal(&conn->twcond); pthread_mutex_unlock(&conn->twsem); } return 0; } if (conn && packet->pk_op == CLSOP) { /* clsconn ? */ DEBUG(TRACE_CHAOS, "chaos: CLSOP: got close \n"); conn->cn_state = CSCLOSED; pthread_mutex_lock(&conn->queuesem); pthread_cond_signal(&conn->queuecond); pthread_mutex_unlock(&conn->queuesem); usleep(100000); /* wait for queue to wake up */ rlsconn(conn); return 0; } if (conn && (cmp_gt(conn->cn_rlast, packet->pk_pkn) || (conn->cn_rlast == packet->pk_pkn))) { struct packet *status; DEBUG(TRACE_CHAOS, "chaos: duplicate data packet\n"); status = chaos_allocate_packet(conn, STSOP, 2 * sizeof(unsigned short)); status->pk_pkn = packet->pk_pkn; conn->cn_racked = conn->cn_rlast; *(unsigned short *) &status->pk_cdata[0] = conn->cn_rlast; *(unsigned short *) &status->pk_cdata[2] = conn->cn_rwsize; chaos_connection_queue(conn, status); return 0; } if (conn) { struct packet *pkt; pkt = pkalloc((size_t) size, 0); memcpy(pkt, packet, size); chaos_connection_queue(conn, pkt); } return 0; } int chaos_poll_local(void) { struct packet *packet; struct packet_queue *node; int size; /* * Is RX buffer full? */ if (!uch11_rcv_buffer_empty && (uch11_csr & CHAOS_CSR_RECEIVE_DONE)) { DEBUG(TRACE_CHAOS, "chaos: polling, but unread data exists\n"); return 0; } if (!uch11_rcv_buffer_empty) { DEBUG(TRACE_CHAOS, "chaos: polling, but buffer not empty\n"); return 0; } if (TAILQ_EMPTY(&queuehead) == true) { return 0; } if (!(uch11_csr & CHAOS_CSR_RECEIVE_ENABLE)) { DEBUG(TRACE_CHAOS, "chaos: polling but rx not enabled\n"); return 0; } pthread_mutex_lock(&recvqueue); node = TAILQ_FIRST(&queuehead); packet = node->packet; TAILQ_REMOVE(&queuehead, node, next); free(node); pthread_mutex_unlock(&recvqueue); size = ((PH_LEN(packet->pk_phead) & 0x0fff) + CHHEADSIZE + 1) / 2; /* * Ignore any packets not to us. */ if (CH_ADDR_SHORT(packet->pk_daddr) != uch11_myaddr) return 0; memcpy(uch11_rcv_buffer, packet, (size_t) size * sizeof(unsigned short)); /* * Hardware header. */ uch11_rcv_buffer[size] = CH_ADDR_SHORT(packet->pk_daddr); uch11_rcv_buffer[size + 1] = CH_ADDR_SHORT(packet->pk_saddr); uch11_rcv_buffer[size + 2] = 0; size += 3; uch11_rcv_buffer_size = size; uch11_rcv_buffer_empty = false; DEBUG(TRACE_CHAOS, "chaos: polling: got chaos packet of %d bytes\n", uch11_rcv_buffer_size * 2); #if 0 dumpbuffer(uch11_rcv_buffer, size * 2); #endif uch11_rx_pkt(); return 0; } |
Added uch11-udp.c.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 | /* Chaos over UDP */ #include <sys/poll.h> #include <sys/socket.h> #include <sys/stat.h> #include <sys/time.h> #include <sys/types.h> #include <sys/uio.h> #include <sys/un.h> #include <netinet/in.h> #include <sys/types.h> #include <sys/socket.h> #include <netdb.h> #include <arpa/inet.h> #include <err.h> #include <pthread.h> #include <stddef.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> #include "uch11.h" #include "uch11-backend.h" #include "chaosd.h" #include "hosttab.h" #include "misc.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" int hybrid_udp_and_local = 0; u_short udp_bridge_chaddr; extern int chaos_send_to_local(char *buffer, int size); extern int chaos_poll_local(void); extern unsigned short uch11_checksum(const unsigned char *addr, int count); int chudpopen(void) { int sock, lport, res, udp_dport, braddr; struct sockaddr_in sin; struct addrinfo *he, hi; struct in_addr udp_dest; if (hybrid_udp_and_local) { if (uch11_serveraddr == 0) { ERR(TRACE_CHAOS, "You configured udp_local_hybrid but there is no server address! Disabling hybrid.\n"); hybrid_udp_and_local = 0; } else { /* Do the local init too */ TAILQ_INIT(&queuehead); pthread_mutex_init(&recvqueue, NULL); } } /* Parse the local port given */ if ((ucfg.chaos_bridgeport_local == NULL) || (ucfg.chaos_bridgeport_local[0] == '\0') || ((lport = atoi(ucfg.chaos_bridgeport_local)) <= 0) || (lport >= (1 << 16))) { /* Or default to 42042? */ err(1, "bad bridgeport_local"); } /* Parse the bridge port given */ if ((ucfg.chaos_bridgeport == NULL) || (ucfg.chaos_bridgeport[0] == '\0') || ((udp_dport = atoi(ucfg.chaos_bridgeport)) <= 0) || (udp_dport >= (1 << 16))) { /* Or default to 42042? */ err(1, "bad bridgeport"); } /* Parse the bridge address given */ if ((ucfg.chaos_bridgeip != NULL) && (ucfg.chaos_bridgeip[0] != '\0')) { /* @@@@ allow IPv6 */ /* Check if it is an explicit IPv4 address */ if (inet_aton(ucfg.chaos_bridgeip, &udp_dest) == 0) { /* Else try to parse a host name */ memset(&hi, 0, sizeof(hi)); hi.ai_family = AF_INET; hi.ai_flags = AI_ADDRCONFIG; if ((res = getaddrinfo(ucfg.chaos_bridgeip, NULL, &hi, &he)) == 0) { struct sockaddr_in *s = (struct sockaddr_in *) he->ai_addr; memcpy(&udp_dest.s_addr, (u_char *) & s->sin_addr, 4); } else { err(1, "bad bridgeip"); } } } else { err(1, "no bridge?"); } /* Parse bridge Chaos address */ if ((ucfg.chaos_bridgechaos == NULL) || (ucfg.chaos_bridgechaos[0] == '\0') | (sscanf(ucfg.chaos_bridgechaos, "%o", &braddr) != 1) || /* Check it's a valid address */ (braddr == 0) || (braddr >= (1 << 16)) || ((braddr & 0xff) == 0) || (((braddr >> 8) & 0xff) == 0)) { err(1, "bad bridgechaos"); } else { udp_bridge_chaddr = (braddr & 0xffff); } NOTICE(TRACE_USIM, "chaos: chudp init, bridge is %#o at %s:%d, local port %d, hybrid %s\n", udp_bridge_chaddr, inet_ntoa(udp_dest), udp_dport, lport, hybrid_udp_and_local ? "true" : "false"); /* Now create a socket, and bind it to our local port */ if ((sock = socket(AF_INET, SOCK_DGRAM, 0)) < 0) { perror("socket failed"); exit(1); } sin.sin_family = AF_INET; sin.sin_port = htons(lport); sin.sin_addr.s_addr = INADDR_ANY; if (bind(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) { perror("udp bind failed"); exit(1); } /* and then connect it to the remote address - since we're only using one and the same */ sin.sin_port = htons(udp_dport); memcpy(&sin.sin_addr.s_addr, &udp_dest.s_addr, 4); if (connect(sock, (struct sockaddr *) &sin, sizeof(sin)) < 0) { perror("udp connect failed"); exit(1); } return sock; } /* from chudp.h and cbridge-chaos.h */ // Max pkt size (12 bits) plus header // The limit of 488 bytes is from MIT AIM 628, although more would fit any modern pkt (and 12 bits would give 4096 as max). // This is due to original Chaos hardware pkts limited to 4032 bits, of which 16 bytes are header. #define CH_PK_MAX_DATALEN 488 /* Protocol version */ #define CHUDP_VERSION 1 /* Protocol function codes */ #define CHUDP_PKT 1 /* Chaosnet packet */ struct chudp_header { char chudp_version; char chudp_function; char chudp_arg1; char chudp_arg2; }; struct chaos_hw_trailer { unsigned short ch_hw_destaddr:16; unsigned short ch_hw_srcaddr:16; unsigned short ch_hw_checksum:16; }; /* Max: CHUDP header, Chaos header, Chaos data, trailer */ #define CHUDP_MAXLEN (sizeof(struct chudp_header)+sizeof(struct pkt_header)+CH_PK_MAX_DATALEN+sizeof(struct chaos_hw_trailer)) u_char trans_chudpbuf[CHUDP_MAXLEN]; /* So sorry about this. */ static void ntohs_buf(u_short *ibuf, u_short *obuf, int len) { int i; for (i = 0; i < len; i += 2) *obuf++ = ntohs(*ibuf++); } int chaos_send_to_udp(char *buffer, int size) { int wcount, dest_addr; /* * Local loopback. */ if (uch11_csr & CHAOS_CSR_LOOP_BACK) { DEBUG(TRACE_CHAOS, "chaos: loopback %d bytes\n", size); memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); return 0; } if (hybrid_udp_and_local) { /* Check if it is for our "local server" */ struct packet *packet; packet = (struct packet *) buffer; if (CH_ADDR_SHORT(packet->pk_daddr) == chaos_addr(ucfg.chaos_servername, 0)) { return chaos_send_to_local(buffer, size); } } wcount = (size + 1) / 2; dest_addr = ((unsigned short *) buffer)[wcount - 3]; DEBUG(TRACE_CHAOS, "chaos: sending packet to udp (dest_addr=%o, uch11_myaddr=%o, size %d, wcount %d)\n", dest_addr, uch11_myaddr, size, wcount); if (size > (int) CHUDP_MAXLEN) { ERR(TRACE_CHAOS, "chaos: packet too long: %d", size); return -1; } /* * Receive packets addressed to us, or broadcasts. */ if ((dest_addr == uch11_myaddr) || (dest_addr == 0)) { memcpy(uch11_rcv_buffer, buffer, size); uch11_rcv_buffer_size = (size + 1) / 2; uch11_rcv_buffer_empty = false; uch11_rx_pkt(); if (dest_addr != 0) /* Broadcasts should be sent also to other */ return 0; } if (chaosd_fd == -1) { ERR(TRACE_CHAOS, "chaos: transmit but chaosd_fd not open!\n"); return 0; } { struct chudp_header *hp = (struct chudp_header *) &trans_chudpbuf; u_char *op = trans_chudpbuf + sizeof(struct chudp_header); int nb; memset(trans_chudpbuf, 0, sizeof(trans_chudpbuf)); /* Set up CHUDP header */ hp->chudp_version = CHUDP_VERSION; hp->chudp_function = CHUDP_PKT; memcpy(op, buffer, size); /* Update the hw trailer dest (and checksum) since what is there is probably the ultimate dest, * but it should be just the next hop */ struct pkt_header *ph = (struct pkt_header *) ((char *) op); u_short pklen = LENFC_LEN(ph->ph_lenfc); u_short offs = sizeof(struct pkt_header) + pklen; if (offs % 2) offs++; struct chaos_hw_trailer *tp = (struct chaos_hw_trailer *) (op + offs); u_short hwdest = tp->ch_hw_destaddr; u_short cksum = tp->ch_hw_checksum; if (hwdest != udp_bridge_chaddr) { INFO(TRACE_CHAOS, "chaos: hw trailer dest is %#o should be %#o\n", hwdest, udp_bridge_chaddr); tp->ch_hw_destaddr = udp_bridge_chaddr; } tp->ch_hw_checksum = htons(uch11_checksum(op, size - 2)); /* Now swap it */ ntohs_buf((u_short *) op, (u_short *) op, size); INFO(TRACE_CHAOS, "chaos: sending %d bytes (pkt size %d)\n", size + sizeof(struct chudp_header), size); if ((nb = send(chaosd_fd, (char *) hp, size + sizeof(struct chudp_header), 0)) < 0) { perror("chaos: send to udp"); ERR(TRACE_CHAOS, "chaos: send to udp failed"); return -1; } else if (nb != size + sizeof(struct chudp_header)) { ERR(TRACE_CHAOS, "chaos: could not send the full pkt: %d sent, expected %d", nb, size + sizeof(struct chudp_header)); return -1; } } return 0; } int chaos_poll_udp(void) { /* basically copy chaos_poll_chaosd but skip CHUDP header and swap */ ssize_t ret; struct pollfd pfd[1]; int nfds, timeout; unsigned char lenbytes[4]; ssize_t len; int dest_addr; if (hybrid_udp_and_local) { /* Prioritize local traffic */ chaos_poll_local(); } if (chaosd_fd == -1) { return 0; } timeout = 0; nfds = 1; pfd[0].fd = chaosd_fd; pfd[0].events = POLLIN; pfd[0].revents = 0; ret = poll(pfd, nfds, timeout); if (ret == -1) { ERR(TRACE_CHAOS, "chaos: polling udp: nothing there (RDN=%o)\n", uch11_csr & CHAOS_CSR_RECEIVE_DONE); return -1; } else if (ret == 0) { // this happens all the time so don't // ERR(TRACE_CHAOS, "chaos: udp poll timeout\n"); return -1; } /* * Is RX buffer full? */ if (!uch11_rcv_buffer_empty && (uch11_csr & CHAOS_CSR_RECEIVE_DONE)) { /* * Toss packets arriving when buffer is already in * use, they will be resent. */ ERR(TRACE_CHAOS, "chaos: polling udp: unread data, drop (RDN=%o, lost %d)\n", uch11_csr & CHAOS_CSR_RECEIVE_DONE, uch11_lost_count); uch11_lost_count++; /* Toss it by reading it */ ret = recv(chaosd_fd, (char *) uch11_rcv_buffer_toss, sizeof(uch11_rcv_buffer_toss), 0); DEBUG(TRACE_CHAOS, "chaos: tossing udp packet of %d bytes\n", ret); return -1; } ret = recv(chaosd_fd, (char *) uch11_rcv_buffer, sizeof(uch11_rcv_buffer), 0); if (ret == -1) { perror("chaos: udp read"); return -1; } else if (ret == 0) { ERR(TRACE_CHAOS, "chaos: udp read zero bytes\n"); return -1; } else if (ret > (int) CHUDP_MAXLEN) { ERR(TRACE_CHAOS, "chaos: udp read too many bytes: %d\n", ret); return -1; } INFO(TRACE_CHAOS, "chaos: polling; got udp packet len %d\n", ret); struct chudp_header *hp = (struct chudp_header *) uch11_rcv_buffer; if (hp->chudp_version != CHUDP_VERSION) { ERR(TRACE_CHAOS, "chaos: chudp version is wrong: %d\n", hp->chudp_version); return -1; } if (hp->chudp_function != CHUDP_PKT) { ERR(TRACE_CHAOS, "chaos: chudp function is wrong: %d\n", hp->chudp_function); return -1; } /* zap chudp header */ memmove((char *) uch11_rcv_buffer, ((char *) uch11_rcv_buffer) + sizeof(struct chudp_header), ret - sizeof(struct chudp_header)); ret -= sizeof(struct chudp_header); /* and swap it */ ntohs_buf(uch11_rcv_buffer, uch11_rcv_buffer, ret); uch11_rcv_buffer_size = (ret + 1) / 2; uch11_rcv_buffer_empty = false; dest_addr = uch11_rcv_buffer[uch11_rcv_buffer_size - 3]; /* * If not to us (or broadcast), ignore. */ if ((dest_addr != uch11_myaddr) && (dest_addr != 0)) { INFO(TRACE_CHAOS, "chaos: ignoring packet not to us (%o): %o\n", uch11_myaddr, dest_addr); uch11_rcv_buffer_size = 0; uch11_rcv_buffer_empty = true; /* * Should uch11_rx_pkt be called here? */ return 0; } INFO(TRACE_CHAOS, "chaos: udp receiving packet: from %o, my %o\n", dest_addr, uch11_myaddr); uch11_rx_pkt(); return 0; } |
Changes to uch11.c.
︙ | ︙ | |||
23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> #include "uch11.h" #include "chaosd.h" #include "hosttab.h" #include "misc.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" | > < < < < < < < < < < < < < < < < < < | | | | | | | | | | | | | | | < < < < < > > > > > > > > > > > > > > > > > > > > > > | | 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 | #include <stdio.h> #include <stdlib.h> #include <string.h> #include <time.h> #include <unistd.h> #include "uch11.h" #include "uch11-backend.h" #include "chaosd.h" #include "hosttab.h" #include "misc.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" int uch11_backend = UCH11_BACKEND_LOCAL; int uch11_myaddr = 0177040; /* LOCAL-CADR */ int uch11_serveraddr = 0177001; /* LOCAL-BRIDGE */ int uch11_csr; int uch11_bit_count; int uch11_lost_count; unsigned short uch11_xmit_buffer[4096]; int uch11_xmit_buffer_size; int uch11_xmit_buffer_ptr; unsigned short uch11_rcv_buffer[4096]; unsigned short uch11_rcv_buffer_toss[4096]; int uch11_rcv_buffer_ptr; int uch11_rcv_buffer_size; bool uch11_rcv_buffer_empty; int reconnect_delay; bool reconnect_chaos; int (*uch11_send)(char *, int); void uch11_force_reconect(void); extern void uch11_reconnect(void); extern void settreeroot(const char *, const char *prefix); pthread_mutex_t recvqueue; pthread_mutex_t recvqueue; struct queue_head queuehead = TAILQ_HEAD_INITIALIZER(queuehead); // udp int chudpopen(void); int chaos_send_to_udp(char *buffer, int size); int chaos_poll_udp(void); // deamon int chaosd_fd; int chaos_send_to_chaosd(char *buffer, int size); int chaos_poll_chaosd(void); // local int chaos_send_to_local(char *buffer, int size); int chaos_poll_local(void); /* * RFC1071: Compute Internet Checksum for COUNT bytes beginning at * location ADDR. */ unsigned short uch11_checksum(const unsigned char *addr, int count) { long sum; sum = 0; while (count > 1) { sum += *(addr) << 8 | *(addr + 1); |
︙ | ︙ | |||
113 114 115 116 117 118 119 | sum = (sum & 0xffff) + (sum >> 16); return (~sum) & 0xffff; } /* * Called when we are we have something in uch11_rcv_buffer. */ | | | | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | sum = (sum & 0xffff) + (sum >> 16); return (~sum) & 0xffff; } /* * Called when we are we have something in uch11_rcv_buffer. */ void uch11_rx_pkt(void) { uch11_rcv_buffer_ptr = 0; uch11_bit_count = (uch11_rcv_buffer_size * 2 * 8) - 1; INFO(TRACE_CHAOS, "chaos: receiving %d words\n", uch11_rcv_buffer_size); if (uch11_rcv_buffer_size > 0) { DEBUG(TRACE_CHAOS, "chaos: set csr receive done, generate interrupt\n"); uch11_csr |= CHAOS_CSR_RECEIVE_DONE; if (uch11_csr & CHAOS_CSR_RECEIVE_ENABLE) assert_unibus_interrupt(0270); } else { DEBUG(TRACE_CHAOS, "chaos: recieve buffer empty\n"); } } void uch11_xmit_done_intr(void) { uch11_csr |= CHAOS_CSR_TRANSMIT_DONE; if (uch11_csr & CHAOS_CSR_TRANSMIT_ENABLE) assert_unibus_interrupt(0270); } |
︙ | ︙ | |||
271 272 273 274 275 276 277 | if ((old_csr & CHAOS_CSR_TRANSMIT_ENABLE) == 0) DEBUG(TRACE_CHAOS, "chaos: CSR transmit enable\n"); uch11_csr |= CHAOS_CSR_TRANSMIT_DONE; } else if (old_csr & CHAOS_CSR_TRANSMIT_ENABLE) DEBUG(TRACE_CHAOS, "chaos: CSR transmit DISable\n"); DEBUG(TRACE_CHAOS, "chaos: set csr bits 0%o, old 0%o, new 0%o\n", v, old_csr, uch11_csr); } | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | | 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 | if ((old_csr & CHAOS_CSR_TRANSMIT_ENABLE) == 0) DEBUG(TRACE_CHAOS, "chaos: CSR transmit enable\n"); uch11_csr |= CHAOS_CSR_TRANSMIT_DONE; } else if (old_csr & CHAOS_CSR_TRANSMIT_ENABLE) DEBUG(TRACE_CHAOS, "chaos: CSR transmit DISable\n"); DEBUG(TRACE_CHAOS, "chaos: set csr bits 0%o, old 0%o, new 0%o\n", v, old_csr, uch11_csr); } void uch11_poll(void) { if (uch11_backend == UCH11_BACKEND_LOCAL) chaos_poll_local(); else if (uch11_backend == UCH11_BACKEND_DAEMON) chaos_poll_chaosd(); else if (uch11_backend == UCH11_BACKEND_UDP) chaos_poll_udp(); } void uch11_force_reconect(void) { if (uch11_backend == UCH11_BACKEND_DAEMON) { WARNING(TRACE_CHAOS, "chaos: forcing reconnect to chaosd\n"); close(chaosd_fd); chaosd_fd = -1; reconnect_chaos = true; |
︙ | ︙ | |||
1024 1025 1026 1027 1028 1029 1030 | } if (root_directory == NULL) err(1, "could not resolve %s", whichconf); NOTICE(TRACE_USIM, "chaos: mapping %s to %s\n", whichdir, root_directory); return 0; } | < | < | < < < < < < < | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < | 376 377 378 379 380 381 382 383 384 385 | } if (root_directory == NULL) err(1, "could not resolve %s", whichconf); NOTICE(TRACE_USIM, "chaos: mapping %s to %s\n", whichdir, root_directory); return 0; } //#include "uch11-chaosd.c" //#include "uch11-local.c" //#include "uch11-udp.c" |
Changes to uch11.h.
1 2 | #pragma once | < < < < < < < < < < < < < < < < < < < < < < > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | #pragma once #define UCH11_BACKEND_DAEMON 0 #define UCH11_BACKEND_LOCAL 1 #define UCH11_BACKEND_UDP 2 extern int uch11_backend; extern int uch11_serveraddr; extern int uch11_myaddr; extern int hybrid_udp_and_local; extern int uch11_init(void); extern void uch11_poll(void); extern int uch11_get_csr(void); extern void uch11_set_csr(int); extern int uch11_get_bit_count(void); extern int uch11_get_rcv_buffer(void); extern void uch11_put_xmit_buffer(int); extern void uch11_xmit_pkt(void); extern void uch11_rx_pkt(void); extern void uch11_reconnect(void); extern void uch11_force_reconect(void); |
Changes to ucode.c.
︙ | ︙ | |||
27 28 29 30 31 32 33 | size_t cycles; int full_trace_lc = 0; int full_trace_repeat_counter = 0; int full_trace_last_lc = 0; | < | 27 28 29 30 31 32 33 34 35 36 37 38 39 40 | size_t cycles; int full_trace_lc = 0; int full_trace_repeat_counter = 0; int full_trace_last_lc = 0; void run(void) { p1 = 0; p0_pc = 0; p1_pc = 0; inhibit = false; |
︙ | ︙ | |||
647 648 649 650 651 652 653 | */ dump_write_header(fd, str4("EOF_"), 0); fsync(fd); close(fd); } void | | | 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 | */ dump_write_header(fd, str4("EOF_"), 0); fsync(fd); close(fd); } void extra_dump_state(char *suffix) // Rename function, merge with save_state, and allow for a template or extra parameter (int incremenet?). { char buffer[256]; static int dump_nr = 0; snprintf(buffer, 256, "/tmp/usim-%03d-%s.state", dump_nr++, suffix); save_state(buffer); printf(".. dumped to file %s\n", buffer); |
︙ | ︙ | |||
768 769 770 771 772 773 774 | printf("LC reached #x%x, dumping state...\n", lc); return true; } } return false; } | < < < | 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 | printf("LC reached #x%x, dumping state...\n", lc); return true; } } return false; } int npc_dump_values[256] = { 0 }; int npc_dump_index = 0; void add_dump_npc(int npc) { printf("adding npc dump value #x%x\n", npc); npc_dump_values[npc_dump_index++] = npc; } |
︙ | ︙ |
Changes to ucode.h.
︙ | ︙ | |||
75 76 77 78 79 80 81 | } symtype_t; typedef struct sym { char *name; uint32_t v; symtype_t mtype; | | | < < < | 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 | } symtype_t; typedef struct sym { char *name; uint32_t v; symtype_t mtype; LIST_ENTRY(sym) next; } sym_t; typedef struct symtab { char *name; int sym_count; LIST_HEAD(symbols, sym) symbols; } symtab_t; extern int sym_read_file(symtab_t *, char *); extern char *sym_find_by_type_val(symtab_t *, symtype_t, uint32_t, int *); extern int sym_find(symtab_t *, char *, int *); /// MARK: udiss.c char *uinst_desc(uint64_t, symtab_t *); /// MARK: utrace.h ??? extern void run(void); void add_dump_lc(int lc); void add_dump_npc(int lc); void add_trace_vmem(int vmem); struct page_s { |
︙ | ︙ | |||
124 125 126 127 128 129 130 | void trace_pdlidx_read(int value); void trace_pdlptr_read(int value); void trace_pdlidx_write(int value); void trace_pdlptr_write(int value); void trace_ucode(void); void record_pc_history(int pc); void check_npc_dump(); | < < | 121 122 123 124 125 126 127 | void trace_pdlidx_read(int value); void trace_pdlptr_read(int value); void trace_pdlidx_write(int value); void trace_pdlptr_write(int value); void trace_ucode(void); void record_pc_history(int pc); void check_npc_dump(); |
Changes to udiss.c.
︙ | ︙ | |||
94 95 96 97 98 99 100 | switch (m) { case 0: type_field(MMEM, u, 032, 006); break; case 1: fsource = load_byte(u, 032, 005); switch (fsource) { | > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > | 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 | switch (m) { case 0: type_field(MMEM, u, 032, 006); break; case 1: fsource = load_byte(u, 032, 005); switch (fsource) { case 0: PRIN1SP("READ-I-ARG"); break; case 1: PRIN1SP("MICRO-STACK-PNTR-AND-DATA"); break; case 2: PRIN1SP("PDL-BUFFER-POINTER"); break; case 3: PRIN1SP("PDL-BUFFER-INDEX"); break; case 4: PRIN1SP("FSOURCE-%o", fsource); break; case 5: PRIN1SP("C-PDL-BUFFER-INDEX"); break; case 6: PRIN1SP("C-OPC-BUFFER"); break; case 7: PRIN1SP("Q-R"); break; case 8: PRIN1SP("VMA"); break; case 9: PRIN1SP("MEMORY-MAP-DATA"); break; case 10: PRIN1SP("MD"); break; case 11: PRIN1SP("LOCATION-COUNTER"); break; case 12: PRIN1SP("MICRO-STACK-PNTR-AND-DATA-POP"); break; case 13 ... 19: PRIN1SP("FSOURCE-%o", fsource); break; case 20: PRIN1SP("C-PDL-BUFFER-POINTER-POP"); break; case 21: PRIN1SP("C-PDL-BUFFER-POINTER"); break; case 22: PRIN1SP("FSOURCE-%o", fsource); break; case 23 ... 31: PRIN1SP("FSOURCE-%o", fsource); break; } } } static void q_dest_desc(uint64_t u) { |
︙ | ︙ | |||
142 143 144 145 146 147 148 | m_dest_desc(uint64_t u) { int fdest; type_field(MMEM, u, 016, 005); fdest = load_byte(u, 023, 005); switch (fdest) { | | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > | 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 | m_dest_desc(uint64_t u) { int fdest; type_field(MMEM, u, 016, 005); fdest = load_byte(u, 023, 005); switch (fdest) { case 0: break; case 1: PRIN1SP("LOCATION-COUNTER"); break; case 2: PRIN1SP("INTERRUPT-CONTROL"); break; case 3 ... 7: PRIN1SP("FDEST-%o", fdest); break; case 8: PRIN1SP("C-PDL-BUFFER-POINTER"); break; case 9: PRIN1SP("C-PDL-BUFFER-POINTER-PUSH"); break; case 10: PRIN1SP("C-PDL-BUFFER-INDEX"); break; case 11: PRIN1SP("PDL-BUFFER-INDEX"); break; case 12: PRIN1SP("PDL-BUFFER-POINTER"); break; case 13: PRIN1SP("MICRO-STACK-DATA-PUSH"); break; case 14: PRIN1SP("OA-REG-LOW"); break; case 15: PRIN1SP("OA-REG-HI"); break; case 16: PRIN1SP("VMA"); break; case 17: PRIN1SP("VMA-START-READ"); break; case 18: PRIN1SP("VMA-START-WRITE"); break; case 19: PRIN1SP("VMA-WRITE-MAP"); break; case 20 ... 23: PRIN1SP("FDEST-%o", fdest); break; case 24: PRIN1SP("MD"); break; case 25: PRIN1SP("FDEST-%o", fdest); break; case 26: PRIN1SP("MD-START-WRITE"); break; case 27: PRIN1SP("MD-WRITE-MAP"); break; case 28 ... 31: PRIN1SP("FDEST-%o", fdest); break; } } static void dest_desc_1(uint64_t u) { int dest; int alu; PRIN1(" ("); dest = load_byte(u, 031, 001); switch (dest) { case 0: m_dest_desc(u); break; case 1: a_dest_desc(u); break; } alu = load_byte(u, 053, 002); dest = load_byte(u, 000, 002); if (alu == 0 && dest == 3) PRIN1("Q-R"); PRIN1(") "); } |
︙ | ︙ | |||
230 231 232 233 234 235 236 | int mf; int q; int alu; int ilong; dest_desc(u); alu_function = load_byte(u, 003, 006); | | > | > > | > > | > > | > > | > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > | > > | > > | > | > > | > > | > | > | > | > > | > > | > > | > > | > > | > > > | > | 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 | int mf; int q; int alu; int ilong; dest_desc(u); alu_function = load_byte(u, 003, 006); switch (alu_function) { case 0: PRIN1SP("SETZ"); break; case 1: PRIN1SP("AND"); break; case 2: PRIN1SP("ANDCA"); break; case 3: PRIN1SP("SETM"); break; case 4: PRIN1SP("ANDCM"); break; case 5: /* SETA */ break; case 6: PRIN1SP("XOR"); break; case 7: PRIN1SP("IOR"); break; case 8: PRIN1SP("ANDCB"); break; case 9: PRIN1SP("EQV"); break; case 10: PRIN1SP("SETCA"); break; case 11: PRIN1SP("ORCA"); break; case 12: PRIN1SP("SETCM"); break; case 13: PRIN1SP("ORCM"); break; case 14: PRIN1SP("ORCB"); break; case 15: PRIN1SP("SETO"); break; case 16 ... 21: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 22: PRIN1SP("SUB"); break; case 23 ... 24: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 25: PRIN1SP("ADD"); break; case 26 ... 27: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 28: PRIN1SP("INCM"); break; case 29 ... 30: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 31: PRIN1SP("LSHM"); break; case 32: PRIN1SP("MUL"); break; case 33: PRIN1SP("DIV"); break; case 34 ... 36: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 37: PRIN1SP("DIVRC"); break; case 38 ... 40: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; case 41: PRIN1SP("DIVFS"); break; case 42 ... 63: PRIN1SP("ALU-FUNCTION-%o", alu_function); break; } alu = load_byte(u, 003, 006); if (alu == 026) sub_carry_desc(u); else normal_carry_desc(u); output_selector = load_byte(u, 014, 002); switch (output_selector) { case 0: PRIN1SP("OUTPUT-SELECTOR-%o", output_selector); break; case 1: break; case 2: PRIN1SP("OUTPUT-SELECTOR-RIGHTSHIFT-1"); break; case 3: PRIN1SP("OUTPUT-SELECTOR-LEFTSHIFT-1"); break; } q = load_byte(u, 000, 002); switch (q) { case 0: break; case 1: PRIN1SP("SHIFT-Q-LEFT"); break; case 2: PRIN1SP("SHIFT-Q-RIGHT"); break; case 3: break; } m_source_desc(u); type_field(AMEM, u, 040, 012); mf = load_byte(u, 012, 002); switch (mf) { case 0: break; case 1 ... 3: PRIN1SP("MF-%o", mf); break; } ilong = load_byte(u, 055, 001); switch (ilong) { case 0: break; case 1: PRIN1SP("ILONG"); break; } } static void type_jump_condition(int number) { switch ((number & 01400) >> 010) { case 0: PRIN1("JUMP"); break; case 1: PRIN1("CALL"); break; case 2: PRIN1("POPJ"); break; case 3: default: PRIN1("CALL-POPJ-??"); break; } if ((040 & number) == 0) { PRIN1("-IF-BIT-"); if ((0100 & number) == 0) PRIN1("Set"); else PRIN1("Clear"); |
︙ | ︙ | |||
325 326 327 328 329 330 331 | int cond; if ((0100 & number) == 0) cond = 07 & number; else cond = (07 & number) + 010; switch (cond) { | | > > > | > > | > > | > > | > > | > > | > > | > | > > > | > > | > > | > > | > > | > > | > > | > | > > | | 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 | int cond; if ((0100 & number) == 0) cond = 07 & number; else cond = (07 & number) + 010; switch (cond) { case 0: tem = "T"; break; case 1: tem = "-LESS-THAN"; break; case 2: tem = "-LESS-OR-EQUAL"; break; case 3: tem = "-EQUAL"; break; case 4: tem = "-IF-PAGE-FAULT"; break; case 5: tem = "-IF-PAGE-FAULT-OR-INTERRUPT"; break; case 6: tem = "-IF-SEQUENCE-BREAK"; break; case 7: tem = "NIL"; break; case 8: tem = "T"; break; case 9: tem = "-GREATER-OR-EQUAL"; break; case 10: tem = "-GREATER-THAN"; break; case 11: tem = "-NOT-EQUAL"; break; case 12: tem = "-IF-NO-PAGE-FAULT"; break; case 13: tem = "-IF-NO-PAGE-FAULT-OR-INTERRUPT"; break; case 14: tem = "-IF-NO-SEQUENCE-BREAK"; break; case 15: tem = "-NEVER"; break; default: tem = NULL; break; } if (strcmp(tem, "T") == 0) { if ((0200 & number) == 0) PRIN1("-XCT-NEXT"); PRIN1(" JUMP-CONDITION "); PRIN1("%o", 07 & number); if ((0100 & number) == 0) PRIN1("(Inverted)"); } else { if (strcmp(tem, "NIL") != 0) PRIN1("%s", tem); if ((0200 & number) == 0) PRIN1("-XCT-NEXT"); |
︙ | ︙ | |||
372 373 374 375 376 377 378 | type_jump_condition(load_byte(u, 000, 012)); m_source_desc(u); type_field(AMEM, u, 040, 012); type_field(IMEM, u, 014, 016); mf = load_byte(u, 012, 002); switch (mf) { | | > | > > | > > | > | 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 | type_jump_condition(load_byte(u, 000, 012)); m_source_desc(u); type_field(AMEM, u, 040, 012); type_field(IMEM, u, 014, 016); mf = load_byte(u, 012, 002); switch (mf) { case 0: break; case 1 ... 3: PRIN1SP("MF-%o", mf); break; } ilong = load_byte(u, 055, 001); switch (ilong) { case 0: break; case 1: PRIN1SP("ILONG"); break; } } static void dsp_const_desc(uint64_t u) { PRIN1(" ("); |
︙ | ︙ | |||
402 403 404 405 406 407 408 | int ilong; int push_own_address_p; int ifetch_p; int disp_const; PRIN1SP("DISPATCH"); disp_const = load_byte(u, 040, 012); | | < | > > | > > | > > | > | > | > > | > > | > > | > > | > > | > > | > | > | > > | > > | > | 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 | int ilong; int push_own_address_p; int ifetch_p; int disp_const; PRIN1SP("DISPATCH"); disp_const = load_byte(u, 040, 012); if (disp_const == 0); else dsp_const_desc(u); byte_field_out(u, load_byte(u, 000, 010), true, false); m_source_desc(u); type_field(DMEM, u, 014, 013); push_own_address_p = load_byte(u, 031, 001); if (push_own_address_p == 1) PRIN1SP("PUSH-OWN-ADDRESS"); ifetch_p = load_byte(u, 030, 001); if (ifetch_p == 1) PRIN1SP("IFETCH"); map = load_byte(u, 010, 002); switch (map) { case 0: break; case 1: PRIN1SP("MAP-14"); break; case 2: PRIN1SP("MAP-15"); break; case 3: PRIN1SP("MAP-BOTH-14-AND-15"); break; } mf = load_byte(u, 012, 002); switch (mf) { case 0: break; case 1 ... 3: PRIN1SP("MF-%o", mf); break; } ilong = load_byte(u, 055, 001); switch (ilong) { case 0: break; case 1: PRIN1SP("ILONG"); break; } } static void byt_desc(uint64_t u) { int byte_operation; int mf; int ilong; dest_desc(u); byte_operation = load_byte(u, 014, 002); switch (byte_operation) { case 0: PRIN1SP("BYTE-OPERATION-%o", byte_operation); break; case 1: PRIN1SP("LDB"); break; case 2: PRIN1SP("SELECTIVE-DEPOSIT"); break; case 3: PRIN1SP("DPB"); break; } byte_field_out(u, load_byte(u, 000, 012), false, true); m_source_desc(u); type_field(AMEM, u, 040, 012); mf = load_byte(u, 012, 002); switch (mf) { case 0: break; case 1 ... 3: PRIN1SP("MF-%o", mf); break; } ilong = load_byte(u, 055, 001); switch (ilong) { case 0: break; case 1: PRIN1SP("ILONG"); break; } } /* * Modify S so that there are no spaces after opening parenthesis, and * before closing parenthesis. */ |
︙ | ︙ | |||
506 507 508 509 510 511 512 | uinstbuf[0] = '\0'; uinstbufp = uinstbuf; uinstsymtab = *symtab; PRIN1("("); popj_after_next_p = load_byte(u, 052, 001); switch (popj_after_next_p) { | | > > | > > | > > | > > | > > | > | > > | > | > > | > | 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 | uinstbuf[0] = '\0'; uinstbufp = uinstbuf; uinstsymtab = *symtab; PRIN1("("); popj_after_next_p = load_byte(u, 052, 001); switch (popj_after_next_p) { case 0: break; case 1: PRIN1SP("POPJ-AFTER-NEXT"); break; } opclass = load_byte(u, 053, 002); switch (opclass) { case 0: alu_desc(u); break; case 1: jmp_desc(u); break; case 2: dsp_desc(u); break; case 3: byt_desc(u); break; } stat_bit = load_byte(u, 056, 001); switch (stat_bit) { case 0: break; case 1: PRIN1SP("STAT-BIT"); break; } bit_47 = load_byte(u, 057, 001); switch (bit_47) { case 0: break; case 1: PRIN1SP("BIT-47"); break; } PRIN1(")"); uinst_strip(uinstbuf); return uinstbuf; } |
Changes to uexec.c.
︙ | ︙ | |||
77 78 79 80 81 82 83 | int alu_carry; uint32_t alu_out; bool oal; bool oah; uint32_t out; | < | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | int alu_carry; uint32_t alu_out; bool oal; bool oah; uint32_t out; uint64_t ir(int pos, int len) { return ((uint64_t) (p0 >> pos)) & ((1 << len) - 1); } |
︙ | ︙ | |||
144 145 146 147 148 149 150 | */ int advanceLC(int ppc) { int old_lc; record_lc_history(); | | | | | 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | */ int advanceLC(int ppc) { int old_lc; record_lc_history(); old_lc = mfmem[1] & 0377777777; /* LC is 26 bits. */ if (should_dump_lc(old_lc)) { char buffer[256]; snprintf(buffer, 256, "lc-%d", old_lc); extra_dump_state(buffer); } if (interrupt_control & (1 << 29)) { mfmem[1]++; /* Byte mode. */ } else { mfmem[1] += 2; /* 16-bit mode. */ } /* * NEED-FETCH? */ if (mfmem[1] & (1UL << 31UL)) { mfmem[1] &= ~(1UL << 31UL); mfmem[020] = old_lc >> 2; |
︙ | ︙ | |||
181 182 183 184 185 186 187 | int lc1; int last_byte_in_word; /* * This is ugly, but follows the hardware logic (I * need to distill it to intent but it seems correct). */ | | | > | > | > | > | | > | > > | | > | > | > | | | | | | | | | | | | | | | | | | | > | 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 | int lc1; int last_byte_in_word; /* * This is ugly, but follows the hardware logic (I * need to distill it to intent but it seems correct). */ lc0b = (interrupt_control & (1 << 29) ? 1 : 0) & /* Byte mode. */ ((mfmem[1] & 1) ? 1 : 0); /* LC0. */ lc1 = (mfmem[1] & 2) ? 1 : 0; last_byte_in_word = (~lc0b & ~lc1) & 1; DEBUG(TRACE_UCODE, "lc0b %d, lc1 %d, last_byte_in_word %d\n", lc0b, lc1, last_byte_in_word); if (last_byte_in_word) /* * Set NEED-FETCH. */ mfmem[1] |= (1UL << 31UL); } return ppc; } uint32_t mfread(int addr) { int res; switch (addr & 037) { case 0: return mfmem[0]; case 1: return (spcptr << 24) | (spc[spcptr] & 01777777); case 2: return mfmem[014] & 01777; case 3: return mfmem[013] & 01777; case 5: DEBUG(TRACE_MICROCODE, "reading pdl[%o] -> %o\n", mfmem[013], pdl[mfmem[013]]); res = pdl[mfmem[013]]; trace_pdlidx_read(mdata); return res; case 6: return opc; case 7: return q; case 010: return mfmem[020]; case 011: { /* MEMORY-MAP-DATA */ uint32_t l2_data; uint32_t l1_data; l1_data = 0; l2_data = 0; l2_data = map_vtop(mfmem[030], (int *) &l1_data, (int *) 0); return ((uint32_t) write_fault_bit << 31) | ((uint32_t) access_fault_bit << 30) | ((l1_data & 037) << 24) | (l2_data & 077777777); } case 012: return mfmem[030]; case 013: return (interrupt_control & (1 << 29)) ? mfmem[1] : mfmem[1] & ~1; case 014: res = (spcptr << 24) | (spc[spcptr] & 01777777); DEBUG(TRACE_MICROCODE, "reading spc[%o] + ptr -> %o\n", spcptr, mdata); spcptr = (spcptr - 1) & 037; return res; case 024: DEBUG(TRACE_MICROCODE, "reading pdl[%o] -> %o, pop\n", mfmem[014], pdl[mfmem[014]]); res = pdl[mfmem[014]]; trace_pdlptr_pop(mdata); mfmem[014] = (mfmem[014] - 1) & 01777; return res; case 025: DEBUG(TRACE_MICROCODE, "reading pdl[%o] -> %o\n", mfmem[014], pdl[mfmem[014]]); res = pdl[mfmem[014]]; trace_pdlptr_read(mdata); return res; } err(1, "unknown MF register (%o) read\n", addr); } void mfwrite(int dest, uint64_t data) { switch (dest >> 5) { case 1: /* LOCATION-COUNTER LC (location counter) 26 bits. */ DEBUG(TRACE_UCODE, "writing LC <- %o\n", data); mfmem[1] = (mfmem[1] & ~0377777777) | (data & 0377777777); if (interrupt_control & (1 << 29)) { /* * ---!!! Not sure about byte mode... */ } else { /* * In half word mode, low order bit is * ignored. */ mfmem[1] &= ~1; } /* * Set NEED-FETCH. */ mfmem[1] |= (1UL << 31UL); break; case 2: /* INTERRUPT-CONTROL Interrupt Control <29-26>. */ DEBUG(TRACE_UCODE, "writing IC <- %o\n", data); interrupt_control = data; if (interrupt_control & (1 << 26)) { DEBUG(TRACE_UCODE, "ic: sequence break request\n"); } if (interrupt_control & (1 << 27)) { DEBUG(TRACE_UCODE, "ic: interrupt enable\n"); } if (interrupt_control & (1 << 28)) { DEBUG(TRACE_UCODE, "ic: bus reset\n"); } if (interrupt_control & (1 << 29)) { DEBUG(TRACE_UCODE, "ic: lc byte mode\n"); } mfmem[1] = (mfmem[1] & ~(017 << 26)) | /* Preserve flags. */ (interrupt_control & (017 << 26)); break; case 010: /* C-PDL-BUFFER-POINTER PDL (addressed by pointer) */ DEBUG(TRACE_UCODE, "writing pdl[%o] <- %o\n", mfmem[014], data); trace_pdlptr_write(data); pdl[mfmem[014]] = data; break; case 011: /* C-PDL-BUFFER-POINTER-PUSH PDL (addressed by pointer, push) */ mfmem[014] = (mfmem[014] + 1) & 01777; DEBUG(TRACE_UCODE, "writing pdl[%o] <- %o, push\n", mfmem[014], data); trace_pdlptr_push(data); pdl[mfmem[014]] = data; break; case 012: /* C-PDL-BUFFER-INDEX PDL (address by index). */ DEBUG(TRACE_UCODE, "writing pdl[%o] <- %o\n", mfmem[013], data); pdl[mfmem[013]] = data; trace_pdlidx_write(data); break; case 013: /* PDL-BUFFER-INDEX PDL index. */ DEBUG(TRACE_UCODE, "pdl-index <- %o\n", data); mfmem[013] = data & 01777; break; case 014: /* PDL-BUFFER-POINTER PDL pointer. */ DEBUG(TRACE_UCODE, "pdl-ptr <- %o\n", data); mfmem[014] = data & 01777; break; case 015: /* MICRO-STACK-DATA-PUSH SPC data, push. */ pushSPC(data); break; case 016: /* OA-REG-LO Next instruction modifier (lo). */ mfmem[016] = data & 0377777777; oal = true; DEBUG(TRACE_UCODE, "setting oa_reg lo %o\n", mfmem[016]); break; case 017: /* OA-REG-HI Next instruction modifier (hi). */ mfmem[017] = data; oah = true; DEBUG(TRACE_UCODE, "setting oa_reg hi %o\n", mfmem[017]); break; case 020: /* VMA VMA register (memory address). */ mfmem[020] = data; break; case 021: /* VMA-START-READ VMA register, start main memory read. */ mfmem[020] = data; vmRead(mfmem[020], &new_md); new_md_delay = 2; break; case 022: /* VMA-START-WRITE VMA register, start main memory write. */ mfmem[020] = data; vmWrite(mfmem[020], mfmem[030]); break; case 023: /* VMA-WRITE-MAP VMA register, write map. */ mfmem[020] = data; DEBUG(TRACE_VM, "vma-write-map md=%o, vma=%o (addr %o)\n", mfmem[030], mfmem[020], mfmem[030] >> 13); mapWrite(); break; case 030: /* MEMORY-DATA MD register (memory data). */ mfmem[030] = data; DEBUG(TRACE_UCODE, "md<-%o\n", mfmem[030]); break; case 031: /* MEMORY-DATA-START-READ */ mfmem[030] = data; vmRead(mfmem[020], &new_md); new_md_delay = 2; break; case 032: /* MEMORY-DATA-START-WRITE */ mfmem[030] = data; vmWrite(mfmem[020], mfmem[030]); break; case 033: /* MEMORY-DATA-WRITE-MAP MD register, write map (like 23). */ mfmem[030] = data; DEBUG(TRACE_UCODE, "memory-data-write-map md=%o, vma=%o (addr %o)\n", mfmem[030], mfmem[020], mfmem[030] >> 13); mapWrite(); break; } err(1, "unknown MF register (%o) write (%lo)\n", dest, data); } /* * Write value to decoded destination. */ void writeDest(int dest) |
︙ | ︙ | |||
465 466 467 468 469 470 471 | alu_carry = (lv >> 32) ? 1 : 0; break; case 025: lv = (int64_t) (mdata | ~adata) + (mdata & adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; | | | | | | > > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > > | > | > > | 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 | alu_carry = (lv >> 32) ? 1 : 0; break; case 025: lv = (int64_t) (mdata | ~adata) + (mdata & adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 026: /* [M-A-1] [SUB] */ sub32(mdata, adata, cin, alu_out, alu_carry); break; case 027: lv = (int64_t) (mdata | ~adata) + mdata + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 030: lv = (int64_t) (mdata | adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 031: /* [ADD] [M+A+1] */ add32(mdata, adata, cin, alu_out, alu_carry); break; case 032: lv = (int64_t) (mdata | adata) + (mdata & ~adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 033: lv = (int64_t) (mdata | adata) + mdata + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 034: /* [M+1] */ alu_out = mdata + (cin ? 1 : 0); alu_carry = 0; if (mdata == (int) 0xffffffff && cin) alu_carry = 1; break; case 035: lv = (int64_t) mdata + (mdata & adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 036: lv = (int64_t) mdata + (mdata | ~adata) + (cin ? 1 : 0); alu_out = (uint32_t) lv; alu_carry = (lv >> 32) ? 1 : 0; break; case 037: /* [M+M] [M+M+1] */ add32(mdata, mdata, cin, alu_out, alu_carry); break; } } void logiOps(int op) { switch (op) { case 000: alu_out = 0; break; case 001: alu_out = mdata & adata; break; case 002: alu_out = mdata & ~adata; break; case 003: alu_out = mdata; break; case 004: alu_out = ~mdata & adata; break; case 005: alu_out = adata; break; case 006: alu_out = mdata ^ adata; break; case 007: alu_out = mdata | adata; break; case 010: alu_out = ~adata & ~mdata; break; case 011: alu_out = adata == mdata; break; case 012: alu_out = ~adata; break; case 013: alu_out = mdata | ~adata; break; case 014: alu_out = ~mdata; break; case 015: alu_out = ~mdata | adata; break; case 016: alu_out = ~mdata | ~adata; break; case 017: alu_out = ~0; break; } } void divOps(int op) { int cin = ir(2, 1); |
︙ | ︙ | |||
677 678 679 680 681 682 683 | break; } } disp_addr &= 03777; DEBUG(TRACE_MICROCODE, "dispatch[%o] -> %o ", disp_addr, dmem[disp_addr]); disp_addr = dmem[disp_addr]; mfmem[0] = disp_const; | | | 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 | break; } } disp_addr &= 03777; DEBUG(TRACE_MICROCODE, "dispatch[%o] -> %o ", disp_addr, dmem[disp_addr]); disp_addr = dmem[disp_addr]; mfmem[0] = disp_const; target = disp_addr & 037777; /* 14 bits. */ n = (disp_addr >> 14) & 1; p = (disp_addr >> 15) & 1; r = (disp_addr >> 16) & 1; DEBUG(TRACE_MICROCODE, "%s%s%s\n", n ? "N " : "", p ? "P " : "", r ? "R " : ""); if (n_plus1 && n) { npc--; } |
︙ | ︙ | |||
727 728 729 730 731 732 733 | int rot = ir(0, 5); DEBUG(TRACE_MICROCODE, "jump-if-bit; rot %o, before %o ", rot, mdata); mdata = rol32(mdata, rot); DEBUG(TRACE_MICROCODE, "after %o\n", mdata); return mdata & 1; } | < | > > | > | > | | | | | > > | 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 | int rot = ir(0, 5); DEBUG(TRACE_MICROCODE, "jump-if-bit; rot %o, before %o ", rot, mdata); mdata = rol32(mdata, rot); DEBUG(TRACE_MICROCODE, "after %o\n", mdata); return mdata & 1; } // Internal condition. switch (ir(0, 4)) { case 0: /* illegal ??? */ break; case 1: return mdata < adata; case 2: return mdata <= adata; case 3: return mdata == adata; case 4: return page_fault_flag; /* vmaok */ case 5: DEBUG(TRACE_MICROCODE, "jump i|pf\n"); /* pgf.or.int */ return page_fault_flag | (interrupt_control & (1 << 27) ? interrupt_pending_flag : 0); case 6: DEBUG(TRACE_MICROCODE, "jump i|pf|sb\n"); /* pgf.or.int.sb */ return page_fault_flag | (interrupt_control & (1 << 27) ? interrupt_pending_flag : 0) | (interrupt_control & (1 << 26)); case 7: return 1; } err(1, "unknown jump (%lo) condition", ir(0, 4)); } void jmp(void) { int target = ir(12, 14); int r = ir(9, 1); |
︙ | ︙ | |||
822 823 824 825 826 827 828 | int left_mask_index; uint32_t left_mask; uint32_t right_mask; int right_mask_index; right_mask_index = pos; | | | | 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 | int left_mask_index; uint32_t left_mask; uint32_t right_mask; int right_mask_index; right_mask_index = pos; left_mask_index = (right_mask_index + widthm1) & 037; /* mod 32? */ left_mask = ~0; right_mask = ~0; left_mask >>= 31 - left_mask_index; right_mask <<= right_mask_index; //DEBUG(TRACE_MICROCODE, "widthm1 %o, pos %o, mr_sr_bits %o\n", widthm1, pos, mr_sr_bits); DEBUG(TRACE_MICROCODE, "left_mask_index %o, right_mask_index %o\n", left_mask_index, right_mask_index); DEBUG(TRACE_MICROCODE, "left_mask %o, right_mask %o, mask %o\n", left_mask, right_mask, left_mask & right_mask); return left_mask & right_mask; } void byt(void) { int dest = ir(14, 12); int mr_sr_bits = ir(12, 2); int pos = ir(0, 5); // p0 & 037; uint32_t mask; DEBUG(TRACE_MICROCODE, "a=%o (%o), m=%o (%o), dest=%o\n", aaddr, adata, maddr, mdata, dest); if (ir(10, 2) == 3) pos = lcbytemode(); |
︙ | ︙ | |||
928 929 930 931 932 933 934 | popj = ir(42, 1); aaddr = ir(32, 10); maddr = ir(26, 5); adata = amem[aaddr]; mdata = (ir(31, 1) == 0) ? mmem[maddr] : mfread(maddr); op = ir(43, 2); switch (op) { | | > > | > > | > > | > > | 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 | popj = ir(42, 1); aaddr = ir(32, 10); maddr = ir(26, 5); adata = amem[aaddr]; mdata = (ir(31, 1) == 0) ? mmem[maddr] : mfread(maddr); op = ir(43, 2); switch (op) { case 0: alu(); break; case 1: jmp(); break; case 2: dsp(); break; case 3: byt(); break; } if (popj) { int old_npc; DEBUG(TRACE_MICROCODE, "popj; "); old_npc = npc; npc = popSPC(); |
︙ | ︙ |
Changes to usim.c.
︙ | ︙ | |||
14 15 16 17 18 19 20 | #include "idle.h" #include "kbd.h" #include "tv.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" | < | 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | #include "idle.h" #include "kbd.h" #include "tv.h" #include "ucfg.h" #include "ucode.h" #include "usim.h" #include "utrace.h" static char *config_filename; bool dump_state_flag; bool verbose_dump_state_flag; bool warm_boot_flag; symtab_t sym_mcr; symtab_t sym_prom; |
︙ | ︙ |
Changes to usym.c.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | /* syms.c --- routines for handling CADRLP symbol tables */ #include <sys/queue.h> #include <err.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <strings.h> #include "ucode.h" static void sym_add(symtab_t *tab, int memory, char *name, uint32_t v) { sym_t *s; s = malloc(sizeof(sym_t)); | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | /* syms.c --- routines for handling CADRLP symbol tables */ #include <sys/queue.h> #include <err.h> #include <stdint.h> #include <stdio.h> #include <stdlib.h> #include <string.h> #include <strings.h> #include "ucode.h" #include "misc.h" static void sym_add(symtab_t *tab, int memory, char *name, uint32_t v) { sym_t *s; s = malloc(sizeof(sym_t)); |
︙ | ︙ | |||
132 133 134 135 136 137 138 | f = fopen(filename, "r"); if (f == NULL) { warn("failed to open: %s", filename); return -1; } LIST_INIT(&tab->symbols); tab->name = strdup(filename); | | | | | | | 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 | f = fopen(filename, "r"); if (f == NULL) { warn("failed to open: %s", filename); return -1; } LIST_INIT(&tab->symbols); tab->name = strdup(filename); xgetline(&l, &lsz, f); xgetline(&l, &lsz, f); /* -4 assembler state info. */ if (strcmp(l, "-4 \n") != 0) errx(1, "sym_read_file: failed to find assembler state info section (-4)"); xgetline(&l, &lsz, f); xgetline(&l, &lsz, f); /* -2 symbol dump start. */ /* * First symbol is handled specially, since directly after the * -2 marker the symbol, type and address follows. */ n = sscanf(l, "-2 %s %s %o \n", sym, symtype, &loc); if (n != 3) errx(1, "sym_read_file: failed to find symbol dump section (-2)"); sym_add(tab, sym_typeno(symtype), sym, loc); while (xgetline(&l, &lsz, f) != -1) { if (strcmp(l, "-1 ") == 0) { /* -1 EOF. */ fclose(f); return 0; } n = sscanf(l, "%s %s %o \n", sym, symtype, &loc); if (n != 3) continue; sym_add(tab, sym_typeno(symtype), sym, loc); } fclose(f); warnx("sym_read_file: failed to eof section marker (-1)"); return 1; } |
Changes to x11.c.
1 2 3 4 5 6 7 | /* x11.c --- X11 routines used by the TV and KBD interfaces */ #include <err.h> #include <stdio.h> #include <stdlib.h> | < < < < > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | /* x11.c --- X11 routines used by the TV and KBD interfaces */ #include <err.h> #include <stdio.h> #include <stdlib.h> #include "ucode.h" #include "ucfg.h" #include "utrace.h" #include "idle.h" #include "kbd.h" #include "cadet.h" #include "knight.h" #include "mouse.h" #include "tv.h" #include "x11.h" #include "misc.h" #define EVENT_MASK \ ExposureMask | \ KeyPressMask | KeyReleaseMask | \ PointerMotionMask | ButtonPressMask | ButtonReleaseMask | \ EnterWindowMask | LeaveWindowMask |
︙ | ︙ | |||
38 39 40 41 42 43 44 | static GC idle_gc; static XImage *ximage; unsigned long Foreground; unsigned long Background; static int old_run_state; bool x11_grab_keyboard; | < < < < < < < | 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | static GC idle_gc; static XImage *ximage; unsigned long Foreground; unsigned long Background; static int old_run_state; bool x11_grab_keyboard; /* Wrappers and utlity functions for X11. */ int x11_query_keymap(char k[32]) { |
︙ | ︙ | |||
88 89 90 91 92 93 94 95 96 97 98 99 100 101 | } } } XFreeModifiermap(modmap); return -1; } /* * Takes E, converts it into a LM (hardware) keycode and sends it to * the IOB KBD. */ static void process_key(XEvent *e, int keydown) { | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | < | | > | | | | | | | > | < < < | < | > | | < > | | < | > | > | < | | | | | | | | > > > < < < < | | | > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 | } } } XFreeModifiermap(modmap); return -1; } /* * Check if all keys are up - too expensive? */ bool cadet_allup_key(void) { bool allup; int mods; int shifts; XModifierKeymap *modmap; char keymap[32]; allup = true; mods = 0; shifts = 0; modmap = x11_get_modifier_mapping(); x11_query_keymap(keymap); /* * For each modifier (and in turn, each keycode associated * with that modifier), check and see if it is down. If that * is the case, clear the set key from KEYMAP. * * Also keep track if we should do an all-up event, and track * the modifiers for later. */ for (int modifier = 0; modifier < 8; modifier++) { int bucky; bucky = kbd_modifier_map[modifier]; for (int i = 0; i < modmap->max_keypermod; i++) { KeyCode keycode; keycode = modmap->modifiermap[modifier * modmap->max_keypermod + i]; if (keymap[keycode / 8] & (1 << keycode % 8)) { keymap[keycode / 8] &= ~(1 << keycode % 8); /* Clear the key in KEYMAP. */ DEBUG(TRACE_KBD, "cadet_allup_key() - bucky pressed (%d); keycode = %d\n", bucky, keycode); cadet_press_bucky(bucky, &mods, &shifts); } } } XFreeModifiermap(modmap); /* * Check if any other key than modifiers (that got cleared * above) are set. If that is the case, do not generate an * all-up event. */ for (int i = 0; i < 32; i++) { if (keymap[i] != 0) { DEBUG(TRACE_KBD, "cadet_allup_key() - found a key that is up which is not a shift; keymap[%d] = 0%o\n", i, keymap[i]); allup = false; break; } } if (allup == true) { DEBUG(TRACE_KBD, "cadet_allup_key() - all-up event; mods = 0%o, shifts = 0%o\n", mods, shifts); cadet_shifts = shifts; /* Keep track of shifts. */ cadet_allup_event(mods); /* Generate all-up event. */ } return allup; } /* * Takes E, converts it into a LM (hardware) keycode and sends it to * the IOB KBD. */ static void process_key(XEvent *e, int keydown) { KeySym keysym; KeyCode keycode; static XComposeStatus status; int bi; unsigned char buf[5]; idle_keyboard_activity(); XLookupString(&e->xkey, (char *) buf, sizeof(buf), &keysym, &status); keycode = x11_keysym_to_keycode(keysym); if (keycode == NoSymbol || keysym > NELEM(kbd_map)) { NOTICE(TRACE_USIM, "kbd (cadet@x11): unable to translate to keycode (keysym = 0%o)\n", keysym); return; } if (kbd_type == 0) { if (!keydown) return; bi = 0; if (e->xkey.state & ShiftMask) knight_process_bucky(ShiftMapIndex, &bi); if (e->xkey.state & LockMask) knight_process_bucky(LockMapIndex, &bi); if (e->xkey.state & ControlMask) knight_process_bucky(ControlMapIndex, &bi); if (e->xkey.state & Mod1Mask) knight_process_bucky(Mod1MapIndex, &bi); if (e->xkey.state & Mod2Mask) knight_process_bucky(Mod2MapIndex, &bi); if (e->xkey.state & Mod3Mask) knight_process_bucky(Mod3MapIndex, &bi); if (e->xkey.state & Mod4Mask) knight_process_bucky(Mod4MapIndex, &bi); if (e->xkey.state & Mod5Mask) knight_process_bucky(Mod5MapIndex, &bi); knight_process_key(keysym, bi, keydown); } else { bi = x11_bucky(keycode); cadet_process_key(keysym, bi, keydown, &cadet_allup_key); } } void x11_idle_change_handler(int mode) { static int width = 22, bottom = 2, right = 2; switch (mode) { case IDLE_IDLE: XSetForeground(display, idle_gc, tv_foreground); break; case IDLE_WORKING: XSetForeground(display, idle_gc, tv_background); break; } XDrawLine(display, window, idle_gc, tv_width - width - right, tv_height - bottom, tv_width - right, tv_height - bottom); } void x11_beep(void) { #if 0 XKeyboardControl kc; XKeyboardControl okc; static int onoff = 100; onoff = -onoff; XGetKeyboardControl(display, &okc); kc.key_click_percent = 0; /* 0 - 100 */ kc.bell_percent = 100; /* 0 - 100 */ kc.bell_pitch = 755; /* Hz */ kc.bell_duration = 10; /* milliseconds */ XChangeKeyboardControl(display, KBBellPercent | KBBellPitch | KBBellDuration, &kc); XBell(display, onoff); /* display, percent */ XChangeKeyboardControl(display, KBBellPercent | KBBellPitch | KBBellDuration, &okc); #endif } void update(int u_minh, int u_minv, int hs, int vs) { XPutImage(display, window, gc, ximage, u_minh, u_minv, u_minh, u_minv, hs, vs); XFlush(display); } void x11_event(void) { XEvent e; tv_update_screen(&update); kbd_dequeue_key_event(); if (is_mouse_warp) { is_mouse_warp = 0; XWarpPointer(display, None, window, 0, 0, 0, 0, mouse_warp_x, mouse_warp_y); } while (XCheckWindowEvent(display, window, EVENT_MASK, &e)) { switch (e.type) { |
︙ | ︙ | |||
185 186 187 188 189 190 191 | case ButtonPress: case ButtonRelease: mouse_event(e.xbutton.x, e.xbutton.y, e.xbutton.button); break; case EnterNotify: /* Switching between windows, assume all keys up */ if (kbd_type == 1) | | < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < < > | | | 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 | case ButtonPress: case ButtonRelease: mouse_event(e.xbutton.x, e.xbutton.y, e.xbutton.button); break; case EnterNotify: /* Switching between windows, assume all keys up */ if (kbd_type == 1) cadet_allup_key(); if (x11_grab_keyboard == true) XGrabKeyboard(display, window, True, GrabModeAsync, GrabModeAsync, CurrentTime); break; case LeaveNotify: if (x11_grab_keyboard == true) XUngrabKeyboard(display, CurrentTime); break; default: break; } } if (old_run_state != !halted) old_run_state = !halted; } void x11_init(void) { char *displayname; unsigned long bg_pixel; int xscreen; Window root; XEvent e; XGCValues gcvalues; XSetWindowAttributes attr; XSizeHints *size_hints; XTextProperty windowName; XTextProperty *pWindowName; XTextProperty iconName; XTextProperty *pIconName; XWMHints *wm_hints; char *window_name; char *icon_name; NOTICE(TRACE_USIM, "tv: using x11 backend for monitor and keyboard\n"); bg_pixel = 0L; pWindowName = &windowName; pIconName = &iconName; window_name = (char *) ucfg.chaos_myname; icon_name = (char *) "CADR"; displayname = getenv("DISPLAY"); display = XOpenDisplay(displayname); if (display == NULL) errx(1, "failed to open display"); idle_register_fd(XConnectionNumber(display)); bitmap_order = BitmapBitOrder(display); xscreen = DefaultScreen(display); color_depth = DisplayPlanes(display, xscreen); tv_foreground = WhitePixel(display, xscreen); tv_background = BlackPixel(display, xscreen); root = RootWindow(display, xscreen); attr.event_mask = EVENT_MASK; window = XCreateWindow(display, root, 0, 0, tv_width, tv_height, 0, color_depth, InputOutput, visual, CWBorderPixel | CWEventMask, &attr); if (window == None) errx(1, "failed to open window"); if (!XStringListToTextProperty(&window_name, 1, pWindowName)) pWindowName = NULL; |
︙ | ︙ | |||
461 462 463 464 465 466 467 | */ do XNextEvent(display, &e); while (e.type != Expose || e.xexpose.count); XFlush(display); ximage = XCreateImage(display, visual, (unsigned) color_depth, ZPixmap, 0, (char *) tv_bitmap, tv_width, tv_height, 32, 0); ximage->byte_order = LSBFirst; | < | 376 377 378 379 380 381 382 383 384 385 | */ do XNextEvent(display, &e); while (e.type != Expose || e.xexpose.count); XFlush(display); ximage = XCreateImage(display, visual, (unsigned) color_depth, ZPixmap, 0, (char *) tv_bitmap, tv_width, tv_height, 32, 0); ximage->byte_order = LSBFirst; idle_gc = XCreateGC(display, window, 0, 0); register_idle_change_handler(x11_idle_change_handler); } |
Changes to x11.h.
1 2 3 4 5 6 7 8 | #pragma once #include <stdbool.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/keysym.h> | < < < < < < < < < < < < | 1 2 3 4 5 6 7 8 9 10 11 12 | #pragma once #include <stdbool.h> #include <X11/Xlib.h> #include <X11/Xutil.h> #include <X11/keysym.h> extern bool x11_grab_keyboard; extern void x11_init(void); extern void x11_event(void); |