Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
Comment: | Merged in trunk changes |
---|---|
Downloads: | Tarball | ZIP archive |
Timelines: | family | ancestors | descendants | both | os8-run-python3 |
Files: | files | file ages | folders |
SHA3-256: |
19490adbd4130dc2a25cd0bbd3d8c642 |
User & Date: | tangent 2019-05-11 15:33:10.316 |
Context
2019-05-11
| ||
18:25 | The configure script now detects whether Python 2 or 3 is installed, and what its binary is called. If both are installed, it prefers Python 3. This then substitutes the value found into all scripts and module shebang lines that previously hardcoded "/usr/bin/env python". With this move, several files got renamed to *.in, as they previously had no other reason to be treated as Autosetup templates. check-in: 1860880163 user: tangent tags: os8-run-python3 | |
15:33 | Merged in trunk changes check-in: 19490adbd4 user: tangent tags: os8-run-python3 | |
15:17 | Assorted small updates to doc/class-simh.md check-in: b4b89f2f1e user: tangent tags: trunk | |
2019-04-16
| ||
11:49 | More print() fixes, this time for os8-cp. check-in: e05a907c3f user: tangent tags: os8-run-python3 | |
Changes
Changes to ChangeLog.md.
1 2 | # PiDP-8/I Changes | | | | 1 2 3 4 5 6 7 8 9 10 11 | # PiDP-8/I Changes <a id="20190425"></a> ## Version 2019.04.25 — The "OS/8 V3F and os8-run" release * The banner feature in this release is that Bill Cattey transformed our `mkos8` tool into the `os8-run` script interpreter, giving us many new features and capabilities: * The OS/8 V3D RK05 media build steps previously hard-coded in Python within `mkos8` are now in a series of scripts in the |
︙ | ︙ | |||
45 46 47 48 49 50 51 | PDP-8 with the TC08 or compatible tape drive controller. That wasn't possible before because the TD8E and TC08 share the same IOT device ID, so you can have only one or the other installed into OS/8 at a time, and that tape didn't have `BUILD` on it, so the manually maintained tape image we were running didn't allow you to easily switch it. | < < < | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | PDP-8 with the TC08 or compatible tape drive controller. That wasn't possible before because the TD8E and TC08 share the same IOT device ID, so you can have only one or the other installed into OS/8 at a time, and that tape didn't have `BUILD` on it, so the manually maintained tape image we were running didn't allow you to easily switch it. * In the prior release, we offered the Python `simh` API for scripting OS/8 and SIMH, plus the `teco-pi-demo` script to show off this API. The `os8-run` command language is based on this same mechanism, offering a simpler method of achieving custom results. The `os8-run` script language is more like a command language at this time than a programming language, so it should be much easier for non-programmers to learn. |
︙ | ︙ | |||
83 84 85 86 87 88 89 | on.</p> * <p>**Reliable**: Some of these configurations have been tested many times over, and all of them have been built at least four times. We've come to expect that this new mechanism will reliably build standard media on your Pi, too.</p> | | < | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 | on.</p> * <p>**Reliable**: Some of these configurations have been tested many times over, and all of them have been built at least four times. We've come to expect that this new mechanism will reliably build standard media on your Pi, too.</p> This is largely the work of Bill Cattey. * Added Bill Cattey's `os8-cp` script, which makes it nearly as easy as `cp(1)` to get files into and out of a SIMH OS/8 media image. Also added his `diff-os8` program, which is not general-purpose, but it shows a useful application of `os8-cp`: to compare two RK05 media images by copying out all of the files from OS/8 into the local |
︙ | ︙ | |||
175 176 177 178 179 180 181 182 183 184 185 186 187 188 | is no PiDP-8/I front panel available and will run `pdp8` instead of our extended `pidp8i-sim` simulator. When the GPIO thread is not running, the simulator runs considerably faster. It’s not clear to me why that should be so on multi-core boxes, since the expensive parts of the PiDP-8/I extensions are running on a separate core, but the measurements are clear. * The Python `simh` API now supports automatic transitions between OS/8 and SIMH context, largely removing the need to manage this manually as in the prior release. This is largely Bill Cattey's work. * The `pidp8i` program now takes optional [verb arguments][pv] that | > > | 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 | is no PiDP-8/I front panel available and will run `pdp8` instead of our extended `pidp8i-sim` simulator. When the GPIO thread is not running, the simulator runs considerably faster. It’s not clear to me why that should be so on multi-core boxes, since the expensive parts of the PiDP-8/I extensions are running on a separate core, but the measurements are clear. * Added the [`--enable-savestate`][esco] configuration option. * The Python `simh` API now supports automatic transitions between OS/8 and SIMH context, largely removing the need to manage this manually as in the prior release. This is largely Bill Cattey's work. * The `pidp8i` program now takes optional [verb arguments][pv] that |
︙ | ︙ | |||
216 217 218 219 220 221 222 | * <p>SysV init was pretty much limited to use by root, so we had to use `sudo` in many cases even though we'd largely divorced the PiDP-8/I software from needing root privileges itself. systemd allows a service to be installed under the account of a normal user, which lets you start and stop the simulator without needing root privilege.</p> | | | | < < < < | 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | * <p>SysV init was pretty much limited to use by root, so we had to use `sudo` in many cases even though we'd largely divorced the PiDP-8/I software from needing root privileges itself. systemd allows a service to be installed under the account of a normal user, which lets you start and stop the simulator without needing root privilege.</p> * <p>We get detailed service status for free via <tt>pidp8i status</tt>, a short alias for the full command, <tt>systemctl --user status pidp8i</tt>.</p> * <p>Gets us away from the SysV init backwards compatibility that may go away in a future release of Raspbian.</p> * Applied a fix from Ian Schofield for a serious problem with the accuracy of the MB register lights in certain contexts, such as while in STOP mode. Bill Cattey verified this fix against a real PDP-8 at the Rhode Island Computer Museum. * Fixed some bugs in our version of the James L-W alt-serial mod feature relative to the mailing list patch. Bug reports and |
︙ | ︙ | |||
280 281 282 283 284 285 286 | OS/8, but it could get stuck in other conditions, such as when running it under a freshly started simulator: $ bin/pdp8 boot/pep001.script * Applied same high-bit improvement as for `hello.pal`. | | | | | | < < | | < < > | | | | > > | | > | 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 | OS/8, but it could get stuck in other conditions, such as when running it under a freshly started simulator: $ bin/pdp8 boot/pep001.script * Applied same high-bit improvement as for `hello.pal`. * Updated SIMH to commit ID 4e0450cff (2019-04-18): * <p>Simulated PDP-8 devices now have description strings so that SIMH commands like `SHOW FEATURES` gives more descriptive output.</p> * <p>SCP (the Ctrl-E command processor) has seen a lot of work since our last release, and the included PiDP-8/I boot scripts make use of two of these improvements: `ELSE` directives in command scripts and `ON SIGTERM` handling.</p> * <p>The core SIMH timing and throttling mechanism has seen a lot of work.</p> * <p>Lots of small improvements to the terminal muxer.</p> * The software now builds and runs on FreeBSD. This just a step toward support for FreeBSD for the Raspberry Pi: we haven’t tried to make the GPIO stuff work at all yet. For now, it just lets this software be used on your FreeBSD desktop or server machine. It may allow building on other BSDs, but that is untested. * `scanswitch` now returns 127 on “no GPIO” rather than 255. * 16 months of maintenance and polishing: better documentation, build system improvements, etc. [cc8m]: https://tangentsoft.com/pidp8i/doc/trunk/doc/cc8-manual.md [esco]: https://tangentsoft.com/pidp8i/doc/trunk/README.md#savestate [pv]: https://tangentsoft.com/pidp8i/doc/trunk/README.md#systemd [sc85]: https://github.com/ncb85/SmallC-85 [tctd]: https://tangentsoft.com/pidp8i/wiki?name=TD8E+vs+TC08 [v3df]: https://tangentsoft.com/pidp8i/wiki?name=OS/8+V3D+vs+V3F <a id="20171222"></a> |
︙ | ︙ |
Changes to Makefile.in.
︙ | ︙ | |||
32 33 34 35 36 37 38 | # shall not be used in advertising or otherwise to promote the sale, # use or other dealings in this Software without prior written # authorization from those authors. ######################################################################## # Git commit ID and time of the latest version of the SIMH 4 project on # GitHub that has been merged into this source base. | | | | 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | # shall not be used in advertising or otherwise to promote the sale, # use or other dealings in this Software without prior written # authorization from those authors. ######################################################################## # Git commit ID and time of the latest version of the SIMH 4 project on # GitHub that has been merged into this source base. SGCID=4e0450cff96830c5aced36928a4427adfc5314f8 SGCTM=2019-04-18T20:03:17-07:00 # C build flags for the PDP-8 simulator and its PiDP-8/I extensions. SIM_CFLAGS := @CFLAGS@ @BUILDMODE@ \ -Wno-unused-result -Wno-parentheses \ -DUSE_READER_THREAD -DHAVE_DLOPEN=$(subst .,,@SH_SOEXT@) -DPIDP8I \ -DSIM_ASYNCH_IO -DHAVE_REGEX_H -DHAVE_GLOB \ -DSIM_GIT_COMMIT_ID=$(SGCID) -DSIM_GIT_COMMIT_TIME=$(SGCTM) \ |
︙ | ︙ | |||
66 67 68 69 70 71 72 | # Simpler options for src/misc/*.c MISC_CFLAGS = -I @srcdir@/src/pidp8i -I src/pidp8i @BUILDMODE@ -std=c99 # Even simpler options for palbart. PALBART_CFLAGS = @BUILDMODE@ | | > | | 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 | # Simpler options for src/misc/*.c MISC_CFLAGS = -I @srcdir@/src/pidp8i -I src/pidp8i @BUILDMODE@ -std=c99 # Even simpler options for palbart. PALBART_CFLAGS = @BUILDMODE@ PIDP8I_SIM = bin/pidp8i-sim PDP8_SIM = bin/pdp8 BINS = $(PIDP8I_SIM) @CC8_CROSS@ \ bin/d8tape \ bin/palbart \ bin/pidp8i-test \ bin/ptp2txt \ libexec/scanswitch BIN_SCRIPTS = \ bin/pidp8i \ |
︙ | ︙ | |||
110 111 112 113 114 115 116 | obj/d8tape \ obj/misc \ obj/palbart \ obj/pidp8i \ obj/SIMH \ obj/SIMH/PDP8 | | > | 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | obj/d8tape \ obj/misc \ obj/palbart \ obj/pidp8i \ obj/SIMH \ obj/SIMH/PDP8 INSTDIRS := bin etc lib/pidp8i libexec \ share/boot share/include share/man/man1 share/media/os8 share/save SIM_OBJS := \ obj/pidp8i/gpio-common.o \ obj/pidp8i/main.o \ obj/SIMH/PDP8/pdp8_df.o \ obj/SIMH/PDP8/pdp8_cpu.o \ obj/SIMH/PDP8/pdp8_clk.o \ |
︙ | ︙ | |||
489 490 491 492 493 494 495 | -name \*.bin -o \ -name \*.dsk -o \ -name \*.rk05 -o \ -name \*.tu56 \ \) -exec @INSTALL@ -D -m 664 -o @INSTUSR@ -g @INSTGRP@ {} @ABSPREFIX@/share/{} \; @@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/*.rk05 @ABSPREFIX@/share/media/os8 @@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/*.tu56 @ABSPREFIX@/share/media/os8 | | > > > > | > > | | | | | | 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 | -name \*.bin -o \ -name \*.dsk -o \ -name \*.rk05 -o \ -name \*.tu56 \ \) -exec @INSTALL@ -D -m 664 -o @INSTUSR@ -g @INSTGRP@ {} @ABSPREFIX@/share/{} \; @@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/*.rk05 @ABSPREFIX@/share/media/os8 @@INSTALL@ -m 644 -o @INSTUSR@ -g @INSTGRP@ bin/*.tu56 @ABSPREFIX@/share/media/os8 for f in boot/*.script ; do \ sed -e 's#%HOME%/\.pidp8i-#@SHAREDIR@/save/#' < $$f > @SHAREDIR@/$$f ; \ chown @INSTUSR@:@INSTGRP@ @SHAREDIR@/$$f ; \ chmod 664 @SHAREDIR@/$$f ; \ done # Called by test-os8-run # Minimizes dependencies to provoke minimal rebuilds. # Builds cc8.tu56, copying in rather than rebuilding source and demo files. os8-sys: test-tmp-tools $(OS8RUN)@OS8_OPTS@ $(V3D_DIST_SCRIPT) $(OS8RUN) $(CC8_TU56_SCRIPT) $(OS8RUN)@OS8_OPTS@ $(V3D_RK05_SCRIPT) reconfig: @AUTOREMAKE@ release: all @srcdir@/tools/mkrel run: $(PIDP8I_SIM) @-libexec/scanswitch > /dev/null ; \ if [ $$? = 127 ] ; then $(PDP8_SIM) boot/run.script ; \ else $(PIDP8I_SIM) boot/run.script ; fi runf run-v3f: $(PIDP8I_SIM) $(V3F_BOOT_TAPE) $(PIDP8I_SIM) boot/run-v3f.script run-tss8: $(PIDP8I_SIM) $(PIDP8I_SIM) boot/tss8.script simh-update simh-update-f: @@srcdir@/tools/simh-update $(subst simh-update,,$@) # Enable this target only if all of the test-os8-run prereqs # were installed at configure time. ifeq (@CAN_TEST_OS8_RUN@, 1) |
︙ | ︙ | |||
585 586 587 588 589 590 591 | # Dependency on the contents of the v3f source directory. V3F_SOURCES := \ @srcdir@/src/os8/v3f/*.PA \ @srcdir@/src/os8/v3f/*.MA \ @srcdir@/src/os8/v3f/*.BI | | | | | 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 | # Dependency on the contents of the v3f source directory. V3F_SOURCES := \ @srcdir@/src/os8/v3f/*.PA \ @srcdir@/src/os8/v3f/*.MA \ @srcdir@/src/os8/v3f/*.BI $(OS8_DIST_RK05): $(V3D_DIST_SRCS) | $(PIDP8I_SIM) $(OS8RUN_OUTFILES) $(OS8RUN)@OS8_OPTS@ $(V3D_DIST_SCRIPT) $(OS8_BOOT_DISK): $(V3D_RK05_SCRIPT) $(OS8_DIST_RK05) $(V3D_PATCHES) @CC8_TU56@ | $(PIDP8I_SIM) $(OS8RUN_OUTFILES) $(OS8RUN)@OS8_OPTS@ $(V3D_RK05_SCRIPT) # Also build an OS/8 source disk, as a convenience to avoid the # need to mount up the 7 source tapes in succession. # # Using an order-only dependency for the simulator and the bin disk: we # only need *a* version of each, they don't have to be recent! OS8_SRC_SRCS = \ $(OS8RUN) $(PIDP8I_DIN) \ lib/pidp8i/dirs.py \ $(V3D_SRC_SCRIPT) \ @srcdir@/media/os8/al-*-sa-*.tu56 $(OS8_SRC_RK05): $(OS8_DIST_RK05) $(OS8_SRC_SRCS) | $(PIDP8I_SIM) $(OS8_BOOT_DISK) $(OS8RUN)@OS8_OPTS@ $(V3D_SRC_SCRIPT) # Build the source disk for OS/8 V3F $(V3F_BUILD_RK05): $(V3F_SRCDIR)/$(V3F_MANIFEST) $(V3F_SOURCES) | $(OS8_BOOT_DISK) cd $(V3F_SRCDIR); @builddir@/bin/os8-cp -v --action-file $(V3F_MANIFEST) # Make a disk with binaries assembled from the V3F source disk |
︙ | ︙ | |||
677 678 679 680 681 682 683 | # by the native OS/8 C compiler. obj/cc8/os8/%.c: @srcdir@/src/cc8/examples/%.c sed '/^#include/d' $< > $@ $(BUILDDIRS): mkdir -p $@ | | | 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 | # by the native OS/8 C compiler. obj/cc8/os8/%.c: @srcdir@/src/cc8/examples/%.c sed '/^#include/d' $< > $@ $(BUILDDIRS): mkdir -p $@ $(PIDP8I_SIM): $(SIM_OBJS) obj/pidp8i/gpio-@LED_DRIVER_MODULE@ls.o $(CC) -o $@ $^ $(LIBS) ln -f bin/pidp8i-sim bin/pdp8 bin/cc8: $(CC8_OBJS) $(CC) -o $@ $^ $(LIBS) bin/d8tape: $(D8TAPE_OBJS) |
︙ | ︙ |
Changes to README.md.
1 2 3 4 5 6 7 8 9 10 11 | # Getting Started with the PiDP-8/I Software ## Prerequisites * A Raspberry Pi with the 40-pin GPIO connector. That rules out the first-generation Raspberry Pi model A and B boards which had a 26-pin GPIO connector. * An SD card containing [a compatible OS][os]. * This software distribution, unpacked somewhere convenient within the | > > > > > > > > > > > > > > > > > > > > | < | < < < < < < < | 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 | # Getting Started with the PiDP-8/I Software ## Orientation You will be reading this file from one of several likely places: * [Online][tlrm], within [the Fossil project repository][home]. * As a text file within the [source packages][src]. * In the read-only [GitHub mirror][ghm]. The source packages and the GitHub mirror are secondary outputs from the Fossil repository, which is the primary home for the PiDP-8/I software development project. [ghm]: https://github.com/tangentsoft/pidp8i [home]: https://tangentsoft.com/pidp8i/ [src]: https://tangentsoft.com/pidp8i/#src [tlrm]: https://tangentsoft.com/pidp8i/doc/trunk/README.md ## Prerequisites * A Raspberry Pi with the 40-pin GPIO connector. That rules out the first-generation Raspberry Pi model A and B boards which had a 26-pin GPIO connector. * An SD card containing [a compatible OS][os]. * This software distribution, unpacked somewhere convenient within the filesystem on the Raspberry Pi. We recommend that you unpack it somewhere your user has read/write access like `$HOME/src/pidp8i`. * We require several tools and libraries that aren't always installed: * A working C compiler and other standard Linux build tools, such as `make(1)`. * Python's `pexpect` library |
︙ | ︙ | |||
325 326 327 328 329 330 331 332 333 334 335 336 337 338 | #### --throttle See [`README-throttle.md`][thro] for the values this option takes. If you don't give this option, the simulator runs as fast as possible, more or less. #### --disable-usb-automount When you install the software on a [systemd][systemd]-based Linux system, we normally configure the OS to automatically mount USB drives when they are initially plugged in, which allows the `SING_STEP` + `DF` media image auto-attach feature to work smoothly. That is, if you plug | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | #### --throttle See [`README-throttle.md`][thro] for the values this option takes. If you don't give this option, the simulator runs as fast as possible, more or less. <a id="savestate"></a> #### --enable-savestate By default, the PiDP-8/I starts up with the core state undefined and runs the boot script you’ve selected either with the IF switches or by passing it on the command line to `pidp8i-sim` or `pdp8`. This brings the simulator up in a known state, with no persistence between restarts other than what was written to the simulated storage devices before the last shutdown. On a real PDP-8 with core memory, however, the values in memory will persist for weeks without power and they aren’t zeroed on power-up. Since the CPU doesn’t start executing anything on power-up in a stock PDP-8 configuration, this means the user can toggle in a program/OS restart address with the switch register (SR), load it into the program counter (PC) with the Load Addr switch, then START the CPU to restart their program without having to reload it from tape or disk. There were also several power fail and restart options designed and made available for the PDP-8 series throughout its lifetime. One of these, the KP8-I for the PDP-8/I would detect a power fail condition, then in the brief time window while the power supply’s reservoir capacitors kept the computer running, this option card would raise an interrupt, giving a user-written routine up to 1 millisecond to save important registers to core so they would persist through the power outage. Then on power-up, it would start executing at core location 00000, where another user routine would load those registers back from core to restart the system where it left off before the power failed. Giving this option gives roughtly the same effect for all generated boot scripts: any time the simulator is shut down gracefully, it saves all key simulator state — registers, core, device assignments, etc. — to a disk file. Then on restart, that script will reload that saved state if it finds the saved state file. This is not identical to a KP8-I, in that it doesn’t require any user-written PDP-8 code to run, which is why it’s optional: it’s ahistoric with respect to the way the included OSes normally ran. Ideally, the default mode of operation would save the core memory state only and would reload only that on start. You can make do that by halting the CPU and resetting the saved registers after the `RESTORE` command in each bootscript you want to affect: EVAL HLT DEP L 0 DEP AC 0 DEP DF 0 DEP IF 0 DEP MQ 0 DEP PC 0 That zeroes the key registers and prevents the CPU from running as it normally would after giving `RESTORE` command to SIMH. #### --disable-usb-automount When you install the software on a [systemd][systemd]-based Linux system, we normally configure the OS to automatically mount USB drives when they are initially plugged in, which allows the `SING_STEP` + `DF` media image auto-attach feature to work smoothly. That is, if you plug |
︙ | ︙ |
Changes to auto.def.
1 2 3 4 | ######################################################################## # auto.def - Configure file for the PiDP-8/I software build system, # based on autosetup. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 | ######################################################################## # auto.def - Configure file for the PiDP-8/I software build system, # based on autosetup. # # Copyright © 2016-2019 Warren Young # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to |
︙ | ︙ | |||
34 35 36 37 38 39 40 41 42 43 44 45 46 47 | use cc use cc-lib use cc-shared # Canonicalize some paths which may be relative and generate others from them set abspfx [file-normalize [get-define prefix]] define ABSPREFIX $abspfx define BOOTDIR "$abspfx/share/boot" define MEDIADIR "$abspfx/share/media" # Define options the configure script shares with os8-run. We insert a # variant of each into the autosetup option list and also write a # version to a Python library file that os8-run can read. This avoids # the need to define the options by hand in both places. | > | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | use cc use cc-lib use cc-shared # Canonicalize some paths which may be relative and generate others from them set abspfx [file-normalize [get-define prefix]] define ABSPREFIX $abspfx define SHAREDIR "$abspfx/share" define BOOTDIR "$abspfx/share/boot" define MEDIADIR "$abspfx/share/media" # Define options the configure script shares with os8-run. We insert a # variant of each into the autosetup option list and also write a # version to a Python library file that os8-run can read. This avoids # the need to define the options by hand in both places. |
︙ | ︙ | |||
78 79 80 81 82 83 84 | set prefix "enable" } append alloptions [list os8-$opt=$def => "$prefix $desc in the built OS/8 RK05 image"] \n } # Now define those command line options that belong only to us. append alloptions { | | > > | | | | | | | > | | | < < | 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 | set prefix "enable" } append alloptions [list os8-$opt=$def => "$prefix $desc in the built OS/8 RK05 image"] \n } # Now define those command line options that belong only to us. append alloptions { alt-serial-mod => "use GPIO drive scheme suitable for James L-W's serial mod method" boot-tape-config: => "Boot tape configuration: tc08, or td12k" boot-tape-version: => "OS/8 version for boot tape, either v3d or v3f" cc8-cross=1 => "do not build the cc8 cross-compiler on the host" debug-mode => "create a debug build (default is release)" lowercase: => "select how lowercase input is to be handled" no-lamp-simulator => "use simple LED driver instead of incandescent lamp simulator" os8-focal=1 => "leave FOCAL 69 and U/W FOCAL off the built OS/8 RK05 image" os8-minimal => "set all --disable-os8-* options, giving minimal OS/8 bin disk" os8-src=1 => "do not build v3d-src.rk05 from OS/8 source tapes" savestate => "save simulator state (regs, core, devices) on exit; restore on restart" serial-mod => "use GPIO drive scheme suitable for Oscar Vermeulen's serial mod method" throttle: => "override the throttle values in the boot scripts" usb-automount=1 => "do not automatically mount USB drives for SING_STEP + DF" } options $alloptions # use btc and btv to set defaults because I can't get the documented # syntax of <name>:=<value> to work. |
︙ | ︙ | |||
230 231 232 233 234 235 236 237 238 239 240 241 242 243 | if {[opt-bool debug-mode]} { msg-result "Creating a debuggable build." define BUILDMODE {-O0 -g} } else { msg-result "Creating a release build." define BUILDMODE {-O2} } set lv [opt-val lowercase] if {$lv == ""} { set lv "auto" } if {$lv == "auto"} { define SIMH_PASS_LOWERCASE } elseif {$lv == "pass"} { define SIMH_PASS_LOWERCASE | > > > > > | 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | if {[opt-bool debug-mode]} { msg-result "Creating a debuggable build." define BUILDMODE {-O0 -g} } else { msg-result "Creating a release build." define BUILDMODE {-O2} } if {[opt-bool savestate]} { msg-result "Enabling simulator state saving and restoration." define SAVESTATE 1 } set lv [opt-val lowercase] if {$lv == ""} { set lv "auto" } if {$lv == "auto"} { define SIMH_PASS_LOWERCASE } elseif {$lv == "pass"} { define SIMH_PASS_LOWERCASE |
︙ | ︙ | |||
522 523 524 525 526 527 528 529 530 531 | user-error "Failed to generate autodependency rules: $result!" } # Write outputs. # # NOTE: If you change the list of files here, change INFILES in # Makefile.in, too. make-config-header src/config.h \ -auto {ENABLE_* HAVE_* PACKAGE_* SIZEOF_*} \ -bare {ILS_MODE PCB_*} | > > > > > > > | | | | 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 | user-error "Failed to generate autodependency rules: $result!" } # Write outputs. # # NOTE: If you change the list of files here, change INFILES in # Makefile.in, too. # # We're listing the top-level Makefile.in last because the templates # ahead of it may have @include directives which modify the @AUTODEPS@ # value substituted into the top-level Makefile.in's autoreconf target. # # The boot/common.script must precede the rest of boot/*, because they # @include the output version. make-config-header src/config.h \ -auto {ENABLE_* HAVE_* PACKAGE_* SIZEOF_*} \ -bare {ILS_MODE PCB_*} make-template bin/pidp8i.in make-template bin/os8-cp.in make-template boot/common.script.in make-template boot/0.script.in make-template boot/2.script.in make-template boot/3.script.in make-template boot/4.script.in make-template boot/6.script.in make-template boot/7.script.in make-template boot/run.script.in |
︙ | ︙ | |||
554 555 556 557 558 559 560 561 | make-template src/cc8/Makefile.in make-template src/cc8/os8/Makefile.in make-template src/pidp8i/gpio-common.c.in make-template src/pidp8i/main.c.in make-template src/SIMH/Makefile.in make-template src/SIMH/PDP8/Makefile.in make-template tools/simh-update.in exec chmod +x "$builddir/bin/pidp8i" "$builddir/tools/simh-update" "$builddir/bin/os8-cp" | > | 568 569 570 571 572 573 574 575 576 | make-template src/cc8/Makefile.in make-template src/cc8/os8/Makefile.in make-template src/pidp8i/gpio-common.c.in make-template src/pidp8i/main.c.in make-template src/SIMH/Makefile.in make-template src/SIMH/PDP8/Makefile.in make-template tools/simh-update.in make-template Makefile.in exec chmod +x "$builddir/bin/pidp8i" "$builddir/tools/simh-update" "$builddir/bin/os8-cp" |
Changes to autosetup/README.autosetup.
|
| | | 1 2 3 4 5 6 7 8 | README.autosetup created by autosetup v0.6.9 This is the autosetup directory for a local install of autosetup. It contains autosetup, support files and loadable modules. *.tcl files in this directory are optional modules which can be loaded with the 'use' directive. |
︙ | ︙ |
Changes to autosetup/autosetup.
1 2 3 4 5 6 7 | #!/bin/sh # Copyright (c) 2006-2011 WorkWare Systems http://www.workware.net.au/ # All rights reserved # vim:se syntax=tcl: # \ dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@" | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | #!/bin/sh # Copyright (c) 2006-2011 WorkWare Systems http://www.workware.net.au/ # All rights reserved # vim:se syntax=tcl: # \ dir=`dirname "$0"`; exec "`$dir/autosetup-find-tclsh`" "$0" "$@" set autosetup(version) 0.6.9 # Can be set to 1 to debug early-init problems set autosetup(debug) [expr {"--debug" in $argv}] ################################################################## # # Main flow of control, option handling |
︙ | ︙ | |||
76 77 78 79 80 81 82 83 84 85 86 87 88 89 | set autosetup(optset) {} # optdefault is a dictionary of default values set autosetup(optdefault) {} # options-defaults is a dictionary of overrides for default values for options set autosetup(options-defaults) {} set autosetup(optionhelp) {} set autosetup(showhelp) 0 # Parse options use getopt # At the is point we don't know what is a valid option # We simply parse anything that looks like an option set autosetup(getopt) [getopt argv] | > > | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 | set autosetup(optset) {} # optdefault is a dictionary of default values set autosetup(optdefault) {} # options-defaults is a dictionary of overrides for default values for options set autosetup(options-defaults) {} set autosetup(optionhelp) {} set autosetup(showhelp) 0 use util # Parse options use getopt # At the is point we don't know what is a valid option # We simply parse anything that looks like an option set autosetup(getopt) [getopt argv] |
︙ | ︙ | |||
460 461 462 463 464 465 466 | # Maybe override the default value if {[dict exists $autosetup(options-defaults) $name]} { # A default was specified with options-defaults, so use it set defaultvalue [dict get $autosetup(options-defaults) $name] dict set autosetup(optdefault) $name $defaultvalue } elseif {![info exists defaultvalue]} { | | | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 | # Maybe override the default value if {[dict exists $autosetup(options-defaults) $name]} { # A default was specified with options-defaults, so use it set defaultvalue [dict get $autosetup(options-defaults) $name] dict set autosetup(optdefault) $name $defaultvalue } elseif {![info exists defaultvalue]} { # For backward compatibility, if ":name" was given, use name as both # the display text and the default value, but only if the user # specified the option without the value set defaultvalue $value } if {$equal eq "="} { # String option with optional value |
︙ | ︙ | |||
703 704 705 706 707 708 709 710 711 712 713 714 715 716 | # Any extra values are similarly appended. # If any value is already contained in the variable (as a substring) it is omitted. # proc define-append {name args} { if {[get-define $name ""] ne ""} { # Avoid duplicates foreach arg $args { set found 0 foreach str [split $::define($name) " "] { if {$str eq $arg} { incr found } } if {!$found} { | > > > | 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 | # Any extra values are similarly appended. # If any value is already contained in the variable (as a substring) it is omitted. # proc define-append {name args} { if {[get-define $name ""] ne ""} { # Avoid duplicates foreach arg $args { if {$arg eq ""} { continue } set found 0 foreach str [split $::define($name) " "] { if {$str eq $arg} { incr found } } if {!$found} { |
︙ | ︙ | |||
740 741 742 743 744 745 746 747 748 749 750 751 752 753 | # @is-defined name # # Returns 1 if the given variable is defined. # proc is-defined {name} { info exists ::define($name) } # @all-defines # # Returns a dictionary (name, value list) of all defined variables. # # This is suitable for use with 'dict', 'array set' or 'foreach' # and allows for arbitrary processing of the defined variables. | > > > > > > > > > > > > | 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 | # @is-defined name # # Returns 1 if the given variable is defined. # proc is-defined {name} { info exists ::define($name) } # @is-define-set name # # Returns 1 if the given variable is defined and is set # to a value other than "" or 0 # proc is-define-set {name} { if {[get-define $name] in {0 ""}} { return 0 } return 1 } # @all-defines # # Returns a dictionary (name, value list) of all defined variables. # # This is suitable for use with 'dict', 'array set' or 'foreach' # and allows for arbitrary processing of the defined variables. |
︙ | ︙ | |||
1036 1037 1038 1039 1040 1041 1042 | # @autosetup-require-version required # # Checks the current version of 'autosetup' against '$required'. # A fatal error is generated if the current version is less than that required. # proc autosetup-require-version {required} { | < | 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 | # @autosetup-require-version required # # Checks the current version of 'autosetup' against '$required'. # A fatal error is generated if the current version is less than that required. # proc autosetup-require-version {required} { if {[compare-versions $::autosetup(version) $required] < 0} { user-error "autosetup version $required is required, but this is $::autosetup(version)" } } proc autosetup_version {} { return "autosetup v$::autosetup(version)" |
︙ | ︙ | |||
1291 1292 1293 1294 1295 1296 1297 | set modsource(formatting.tcl) { # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # Module which provides common text formatting | | | 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 | set modsource(formatting.tcl) { # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # Module which provides common text formatting # This is designed for documentation which looks like: # code {...} # or # code { # ... # ... # } # In the second case, we need to work out the indenting |
︙ | ︙ | |||
1682 1683 1684 1685 1686 1687 1688 | set modsource(install.tcl) { # Copyright (c) 2006-2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # Module which can install autosetup # autosetup(installed)=1 means that autosetup is not running from source | | | 1698 1699 1700 1701 1702 1703 1704 1705 1706 1707 1708 1709 1710 1711 1712 | set modsource(install.tcl) { # Copyright (c) 2006-2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # Module which can install autosetup # autosetup(installed)=1 means that autosetup is not running from source # autosetup(sysinstall)=1 means that autosetup is running from a sysinstall version # shared=1 means that we are trying to do a sysinstall. This is only possible from the development source. proc autosetup_install {dir {shared 0}} { global autosetup if {$shared} { if {$autosetup(installed) || $autosetup(sysinstall)} { user-error "Can only --sysinstall from development sources" |
︙ | ︙ | |||
1837 1838 1839 1840 1841 1842 1843 | } } else { puts "I don't see configure, so I will create it." } if {$shared} { writefile configure \ {#!/bin/sh | < | | | 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 | } } else { puts "I don't see configure, so I will create it." } if {$shared} { writefile configure \ {#!/bin/sh WRAPPER="$0"; export WRAPPER; "autosetup" "$@" } } else { writefile configure \ {#!/bin/sh dir="`dirname "$0"`/autosetup" WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@" } } catch {exec chmod 755 configure} } # Append the contents of $file to filehandle $f proc autosetup_install_append {f file} { |
︙ | ︙ | |||
2341 2342 2343 2344 2345 2346 2347 2348 2349 2350 2351 2352 2353 2354 | proc prefix {pre list} { set result {} foreach p $list { lappend result $pre$p } return $result } } # ----- @module wiki-formatting.tcl ----- set modsource(wiki-formatting.tcl) { # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved | > > > > > > > > > > | 2356 2357 2358 2359 2360 2361 2362 2363 2364 2365 2366 2367 2368 2369 2370 2371 2372 2373 2374 2375 2376 2377 2378 2379 | proc prefix {pre list} { set result {} foreach p $list { lappend result $pre$p } return $result } # @lpop list # # Removes the last entry from the given list and returns it. proc lpop {listname} { upvar $listname list set val [lindex $list end] set list [lrange $list 0 end-1] return $val } } # ----- @module wiki-formatting.tcl ----- set modsource(wiki-formatting.tcl) { # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved |
︙ | ︙ |
Changes to autosetup/autosetup-config.guess.
1 2 | #! /bin/sh # Attempt to guess a canonical system name. | | | | | | | | 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 | #! /bin/sh # Attempt to guess a canonical system name. # Copyright 1992-2018 Free Software Foundation, Inc. timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # # Originally written by Per Bothner; maintained since 2000 by Ben Elliston. # # You can get the latest version of this script from: # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess # # Please send patches to <config-patches@gnu.org>. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] Output the configuration name of the system \`$me' is run on. Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.guess ($timestamp) Originally written by Per Bothner. Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." |
︙ | ︙ | |||
103 104 105 106 107 108 109 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in | | | | 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 | { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ; dummy=$tmp/dummy ; tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ; case $CC_FOR_BUILD,$HOST_CC,$CC in ,,) echo "int x;" > "$dummy.c" ; for c in cc gcc c89 c99 ; do if ($c -c -o "$dummy.o" "$dummy.c") >/dev/null 2>&1 ; then CC_FOR_BUILD="$c"; break ; fi ; done ; if test x"$CC_FOR_BUILD" = x ; then CC_FOR_BUILD=no_compiler_found ; fi ;; |
︙ | ︙ | |||
128 129 130 131 132 133 134 | fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown | | | | | > > > > > > > | | > > | | > > > > > | | | > > > | > > > > > > > | | | | > > > | > > > > | | | > > > | > > > > > > | | | | | | | | | | | | | | | | < < < < < < < < < | | | | 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 | fi UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown UNAME_SYSTEM=`(uname -s) 2>/dev/null` || UNAME_SYSTEM=unknown UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown case "$UNAME_SYSTEM" in Linux|GNU|GNU/*) # If the system lacks a compiler, then just pick glibc. # We could probably try harder. LIBC=gnu eval "$set_cc_for_build" cat <<-EOF > "$dummy.c" #include <features.h> #if defined(__UCLIBC__) LIBC=uclibc #elif defined(__dietlibc__) LIBC=dietlibc #else LIBC=gnu #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^LIBC' | sed 's, ,,g'`" # If ldd exists, use it to detect musl libc. if command -v ldd >/dev/null && \ ldd --version 2>&1 | grep -q ^musl then LIBC=musl fi ;; esac # Note: order is significant - the case branches are not exclusive. case "$UNAME_MACHINE:$UNAME_SYSTEM:$UNAME_RELEASE:$UNAME_VERSION" in *:NetBSD:*:*) # NetBSD (nbsd) targets should (where applicable) match one or # more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*, # *-*-netbsdecoff* and *-*-netbsd*. For targets that recently # switched to ELF, *-*-netbsd* would select the old # object file format. This provides both forward # compatibility and a consistent mechanism for selecting the # object file format. # # Note: NetBSD doesn't particularly care about the vendor # portion of the name. We always set it to "unknown". sysctl="sysctl -n hw.machine_arch" UNAME_MACHINE_ARCH=`(uname -p 2>/dev/null || \ "/sbin/$sysctl" 2>/dev/null || \ "/usr/sbin/$sysctl" 2>/dev/null || \ echo unknown)` case "$UNAME_MACHINE_ARCH" in armeb) machine=armeb-unknown ;; arm*) machine=arm-unknown ;; sh3el) machine=shl-unknown ;; sh3eb) machine=sh-unknown ;; sh5el) machine=sh5le-unknown ;; earmv*) arch=`echo "$UNAME_MACHINE_ARCH" | sed -e 's,^e\(armv[0-9]\).*$,\1,'` endian=`echo "$UNAME_MACHINE_ARCH" | sed -ne 's,^.*\(eb\)$,\1,p'` machine="${arch}${endian}"-unknown ;; *) machine="$UNAME_MACHINE_ARCH"-unknown ;; esac # The Operating System including object format, if it has switched # to ELF recently (or will in the future) and ABI. case "$UNAME_MACHINE_ARCH" in earm*) os=netbsdelf ;; arm*|i386|m68k|ns32k|sh3*|sparc|vax) eval "$set_cc_for_build" if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ELF__ then # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout). # Return netbsd for either. FIX? os=netbsd else os=netbsdelf fi ;; *) os=netbsd ;; esac # Determine ABI tags. case "$UNAME_MACHINE_ARCH" in earm*) expr='s/^earmv[0-9]/-eabi/;s/eb$//' abi=`echo "$UNAME_MACHINE_ARCH" | sed -e "$expr"` ;; esac # The OS release # Debian GNU/NetBSD machines have a different userland, and # thus, need a distinct triplet. However, they do not need # kernel version information, so it can be replaced with a # suitable tag, in the style of linux-gnu. case "$UNAME_VERSION" in Debian*) release='-gnu' ;; *) release=`echo "$UNAME_RELEASE" | sed -e 's/[-_].*//' | cut -d. -f1,2` ;; esac # Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM: # contains redundant information, the shorter form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used. echo "$machine-${os}${release}${abi}" exit ;; *:Bitrig:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/Bitrig.//'` echo "$UNAME_MACHINE_ARCH"-unknown-bitrig"$UNAME_RELEASE" exit ;; *:OpenBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'` echo "$UNAME_MACHINE_ARCH"-unknown-openbsd"$UNAME_RELEASE" exit ;; *:LibertyBSD:*:*) UNAME_MACHINE_ARCH=`arch | sed 's/^.*BSD\.//'` echo "$UNAME_MACHINE_ARCH"-unknown-libertybsd"$UNAME_RELEASE" exit ;; *:MidnightBSD:*:*) echo "$UNAME_MACHINE"-unknown-midnightbsd"$UNAME_RELEASE" exit ;; *:ekkoBSD:*:*) echo "$UNAME_MACHINE"-unknown-ekkobsd"$UNAME_RELEASE" exit ;; *:SolidBSD:*:*) echo "$UNAME_MACHINE"-unknown-solidbsd"$UNAME_RELEASE" exit ;; macppc:MirBSD:*:*) echo powerpc-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:MirBSD:*:*) echo "$UNAME_MACHINE"-unknown-mirbsd"$UNAME_RELEASE" exit ;; *:Sortix:*:*) echo "$UNAME_MACHINE"-unknown-sortix exit ;; *:Redox:*:*) echo "$UNAME_MACHINE"-unknown-redox exit ;; mips:OSF1:*.*) echo mips-dec-osf1 exit ;; alpha:OSF1:*:*) case $UNAME_RELEASE in *4.0) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'` ;; *5.*) UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'` ;; esac # According to Compaq, /usr/sbin/psrinfo has been available on # OSF/1 and Tru64 systems produced since 1995. I hope that # covers most systems running today. This code pipes the CPU # types through head -n 1, so we only detect the type of CPU 0. ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^ The alpha \(.*\) processor.*$/\1/p' | head -n 1` case "$ALPHA_CPU_TYPE" in "EV4 (21064)") UNAME_MACHINE=alpha ;; "EV4.5 (21064)") UNAME_MACHINE=alpha ;; "LCA4 (21066/21068)") UNAME_MACHINE=alpha ;; "EV5 (21164)") UNAME_MACHINE=alphaev5 ;; "EV5.6 (21164A)") UNAME_MACHINE=alphaev56 ;; "EV5.6 (21164PC)") UNAME_MACHINE=alphapca56 ;; "EV5.7 (21164PC)") UNAME_MACHINE=alphapca57 ;; "EV6 (21264)") UNAME_MACHINE=alphaev6 ;; "EV6.7 (21264A)") UNAME_MACHINE=alphaev67 ;; "EV6.8CB (21264C)") UNAME_MACHINE=alphaev68 ;; "EV6.8AL (21264B)") UNAME_MACHINE=alphaev68 ;; "EV6.8CX (21264D)") UNAME_MACHINE=alphaev68 ;; "EV6.9A (21264/EV69A)") UNAME_MACHINE=alphaev69 ;; "EV7 (21364)") UNAME_MACHINE=alphaev7 ;; "EV7.9 (21364A)") UNAME_MACHINE=alphaev79 ;; esac # A Pn.n version is a patched version. # A Vn.n version is a released version. # A Tn.n version is a released field test version. # A Xn.n version is an unreleased experimental baselevel. # 1.2 uses "1.2" for uname -r. echo "$UNAME_MACHINE"-dec-osf"`echo "$UNAME_RELEASE" | sed -e 's/^[PVTX]//' | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz`" # Reset EXIT trap before exiting to avoid spurious non-zero exit code. exitcode=$? trap '' 0 exit $exitcode ;; Amiga*:UNIX_System_V:4.0:*) echo m68k-unknown-sysv4 exit ;; *:[Aa]miga[Oo][Ss]:*:*) echo "$UNAME_MACHINE"-unknown-amigaos exit ;; *:[Mm]orph[Oo][Ss]:*:*) echo "$UNAME_MACHINE"-unknown-morphos exit ;; *:OS/390:*:*) echo i370-ibm-openedition exit ;; *:z/VM:*:*) echo s390-ibm-zvmoe exit ;; *:OS400:*:*) echo powerpc-ibm-os400 exit ;; arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*) echo arm-acorn-riscix"$UNAME_RELEASE" exit ;; arm*:riscos:*:*|arm*:RISCOS:*:*) echo arm-unknown-riscos exit ;; SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*) echo hppa1.1-hitachi-hiuxmpp exit ;; |
︙ | ︙ | |||
342 343 344 345 346 347 348 | echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 511 512 513 514 515 516 517 518 | echo sparc-icl-nx6 exit ;; DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*) case `/usr/bin/uname -p` in sparc) echo sparc-icl-nx7; exit ;; esac ;; s390x:SunOS:*:*) echo "$UNAME_MACHINE"-ibm-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; sun4H:SunOS:5.*:*) echo sparc-hal-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2"`echo "$UNAME_RELEASE" | sed -e 's/[^.]*//'`" exit ;; i86pc:AuroraUX:5.*:* | i86xen:AuroraUX:5.*:*) echo i386-pc-auroraux"$UNAME_RELEASE" exit ;; i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*) eval "$set_cc_for_build" SUN_ARCH=i386 # If there is a compiler, see if it is configured for 64-bit objects. # Note that the Sun cc does not turn __LP64__ into 1 like gcc does. # This test works for both compilers. if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __amd64'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then SUN_ARCH=x86_64 fi fi echo "$SUN_ARCH"-pc-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:6*:*) # According to config.sub, this is the proper way to canonicalize # SunOS6. Hard to guess exactly what SunOS6 will be like, but # it's likely to be more like Solaris than SunOS4. echo sparc-sun-solaris3"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; sun4*:SunOS:*:*) case "`/usr/bin/arch -k`" in Series*|S4*) UNAME_RELEASE=`uname -v` ;; esac # Japanese Language versions have a version number like `4.1.3-JL'. echo sparc-sun-sunos"`echo "$UNAME_RELEASE"|sed -e 's/-/_/'`" exit ;; sun3*:SunOS:*:*) echo m68k-sun-sunos"$UNAME_RELEASE" exit ;; sun*:*:4.2BSD:*) UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null` test "x$UNAME_RELEASE" = x && UNAME_RELEASE=3 case "`/bin/arch`" in sun3) echo m68k-sun-sunos"$UNAME_RELEASE" ;; sun4) echo sparc-sun-sunos"$UNAME_RELEASE" ;; esac exit ;; aushp:SunOS:*:*) echo sparc-auspex-sunos"$UNAME_RELEASE" exit ;; # The situation for MiNT is a little confusing. The machine name # can be virtually everything (everything which is not # "atarist" or "atariste" at least should have a processor # > m68000). The system name ranges from "MiNT" over "FreeMiNT" # to the lowercase version "mint" (or "freemint"). Finally # the system name "TOS" denotes a system which is actually not # MiNT. But MiNT is downward compatible to TOS, so this should # be no problem. atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint"$UNAME_RELEASE" exit ;; atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*) echo m68k-atari-mint"$UNAME_RELEASE" exit ;; *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*) echo m68k-atari-mint"$UNAME_RELEASE" exit ;; milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*) echo m68k-milan-mint"$UNAME_RELEASE" exit ;; hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*) echo m68k-hades-mint"$UNAME_RELEASE" exit ;; *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*) echo m68k-unknown-mint"$UNAME_RELEASE" exit ;; m68k:machten:*:*) echo m68k-apple-machten"$UNAME_RELEASE" exit ;; powerpc:machten:*:*) echo powerpc-apple-machten"$UNAME_RELEASE" exit ;; RISC*:Mach:*:*) echo mips-dec-mach_bsd4.3 exit ;; RISC*:ULTRIX:*:*) echo mips-dec-ultrix"$UNAME_RELEASE" exit ;; VAX*:ULTRIX*:*:*) echo vax-dec-ultrix"$UNAME_RELEASE" exit ;; 2020:CLIX:*:* | 2430:CLIX:*:*) echo clipper-intergraph-clix"$UNAME_RELEASE" exit ;; mips:*:*:UMIPS | mips:*:*:RISCos) eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #ifdef __cplusplus #include <stdio.h> /* for printf() prototype */ int main (int argc, char *argv[]) { #else int main (argc, argv) int argc; char *argv[]; { #endif #if defined (host_mips) && defined (MIPSEB) #if defined (SYSTYPE_SYSV) printf ("mips-mips-riscos%ssysv\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_SVR4) printf ("mips-mips-riscos%ssvr4\\n", argv[1]); exit (0); #endif #if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD) printf ("mips-mips-riscos%sbsd\\n", argv[1]); exit (0); #endif #endif exit (-1); } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && dummyarg=`echo "$UNAME_RELEASE" | sed -n 's/\([0-9]*\).*/\1/p'` && SYSTEM_NAME=`"$dummy" "$dummyarg"` && { echo "$SYSTEM_NAME"; exit; } echo mips-mips-riscos"$UNAME_RELEASE" exit ;; Motorola:PowerMAX_OS:*:*) echo powerpc-motorola-powermax exit ;; Motorola:*:4.3:PL8-*) echo powerpc-harris-powermax exit ;; |
︙ | ︙ | |||
499 500 501 502 503 504 505 | exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 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 | exit ;; m88k:*:3*:R3*) echo m88k-motorola-sysv3 exit ;; AViiON:dgux:*:*) # DG/UX returns AViiON for all architectures UNAME_PROCESSOR=`/usr/bin/uname -p` if [ "$UNAME_PROCESSOR" = mc88100 ] || [ "$UNAME_PROCESSOR" = mc88110 ] then if [ "$TARGET_BINARY_INTERFACE"x = m88kdguxelfx ] || \ [ "$TARGET_BINARY_INTERFACE"x = x ] then echo m88k-dg-dgux"$UNAME_RELEASE" else echo m88k-dg-dguxbcs"$UNAME_RELEASE" fi else echo i586-dg-dgux"$UNAME_RELEASE" fi exit ;; M88*:DolphinOS:*:*) # DolphinOS (SVR3) echo m88k-dolphin-sysv3 exit ;; M88*:*:R3*:*) # Delta 88k system running SVR3 echo m88k-motorola-sysv3 exit ;; XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3) echo m88k-tektronix-sysv3 exit ;; Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD) echo m68k-tektronix-bsd exit ;; *:IRIX*:*:*) echo mips-sgi-irix"`echo "$UNAME_RELEASE"|sed -e 's/-/_/g'`" exit ;; ????????:AIX?:[12].1:2) # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX. echo romp-ibm-aix # uname -m gives an 8 hex-code CPU id exit ;; # Note that: echo "'`uname -s`'" gives 'AIX ' i*86:AIX:*:*) echo i386-ibm-aix exit ;; ia64:AIX:*:*) if [ -x /usr/bin/oslevel ] ; then IBM_REV=`/usr/bin/oslevel` else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi echo "$UNAME_MACHINE"-ibm-aix"$IBM_REV" exit ;; *:AIX:2:3) if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include <sys/systemcfg.h> main() { if (!__power_pc()) exit(1); puts("powerpc-ibm-aix3.2.5"); exit(0); } EOF if $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` then echo "$SYSTEM_NAME" else echo rs6000-ibm-aix3.2.5 fi elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then echo rs6000-ibm-aix3.2.4 else echo rs6000-ibm-aix3.2 fi exit ;; *:AIX:*:[4567]) IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'` if /usr/sbin/lsattr -El "$IBM_CPU_ID" | grep ' POWER' >/dev/null 2>&1; then IBM_ARCH=rs6000 else IBM_ARCH=powerpc fi if [ -x /usr/bin/lslpp ] ; then IBM_REV=`/usr/bin/lslpp -Lqc bos.rte.libc | awk -F: '{ print $3 }' | sed s/[0-9]*$/0/` else IBM_REV="$UNAME_VERSION.$UNAME_RELEASE" fi echo "$IBM_ARCH"-ibm-aix"$IBM_REV" exit ;; *:AIX:*:*) echo rs6000-ibm-aix exit ;; ibmrt:4.4BSD:*|romp-ibm:4.4BSD:*) echo romp-ibm-bsd4.4 exit ;; ibmrt:*BSD:*|romp-ibm:BSD:*) # covers RT/PC BSD and echo romp-ibm-bsd"$UNAME_RELEASE" # 4.3 with uname added to exit ;; # report: romp-ibm BSD 4.3 *:BOSX:*:*) echo rs6000-bull-bosx exit ;; DPX/2?00:B.O.S.:*:*) echo m68k-bull-sysv3 exit ;; 9000/[34]??:4.3bsd:1.*:*) echo m68k-hp-bsd exit ;; hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*) echo m68k-hp-bsd4.4 exit ;; 9000/[34678]??:HP-UX:*:*) HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` case "$UNAME_MACHINE" in 9000/31?) HP_ARCH=m68000 ;; 9000/[34]??) HP_ARCH=m68k ;; 9000/[678][0-9][0-9]) if [ -x /usr/bin/getconf ]; then sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null` sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null` case "$sc_cpu_version" in 523) HP_ARCH=hppa1.0 ;; # CPU_PA_RISC1_0 528) HP_ARCH=hppa1.1 ;; # CPU_PA_RISC1_1 532) # CPU_PA_RISC2_0 case "$sc_kernel_bits" in 32) HP_ARCH=hppa2.0n ;; 64) HP_ARCH=hppa2.0w ;; '') HP_ARCH=hppa2.0 ;; # HP-UX 10.20 esac ;; esac fi if [ "$HP_ARCH" = "" ]; then eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #define _HPUX_SOURCE #include <stdlib.h> #include <unistd.h> int main () { |
︙ | ︙ | |||
659 660 661 662 663 664 665 | puts ("hppa2.0"); break; #endif default: puts ("hppa1.0"); break; } exit (0); } EOF | | | | | | | | | | | | | 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 | puts ("hppa2.0"); break; #endif default: puts ("hppa1.0"); break; } exit (0); } EOF (CCOPTS="" $CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null) && HP_ARCH=`"$dummy"` test -z "$HP_ARCH" && HP_ARCH=hppa fi ;; esac if [ "$HP_ARCH" = hppa2.0w ] then eval "$set_cc_for_build" # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating # 32-bit code. hppa64-hp-hpux* has the same kernel and a compiler # generating 64-bit code. GNU and HP use different nomenclature: # # $ CC_FOR_BUILD=cc ./config.guess # => hppa2.0w-hp-hpux11.23 # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess # => hppa64-hp-hpux11.23 if echo __LP64__ | (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | grep -q __LP64__ then HP_ARCH=hppa2.0w else HP_ARCH=hppa64 fi fi echo "$HP_ARCH"-hp-hpux"$HPUX_REV" exit ;; ia64:HP-UX:*:*) HPUX_REV=`echo "$UNAME_RELEASE"|sed -e 's/[^.]*.[0B]*//'` echo ia64-hp-hpux"$HPUX_REV" exit ;; 3050*:HI-UX:*:*) eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #include <unistd.h> int main () { long cpu = sysconf (_SC_CPU_VERSION); /* The order matters, because CPU_IS_HP_MC68K erroneously returns true for CPU_PA_RISC1_0. CPU_IS_PA_RISC returns correct |
︙ | ︙ | |||
717 718 719 720 721 722 723 | } else if (CPU_IS_HP_MC68K (cpu)) puts ("m68k-hitachi-hiuxwe2"); else puts ("unknown-hitachi-hiuxwe2"); exit (0); } EOF | | | | | | | 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 | } else if (CPU_IS_HP_MC68K (cpu)) puts ("m68k-hitachi-hiuxwe2"); else puts ("unknown-hitachi-hiuxwe2"); exit (0); } EOF $CC_FOR_BUILD -o "$dummy" "$dummy.c" && SYSTEM_NAME=`"$dummy"` && { echo "$SYSTEM_NAME"; exit; } echo unknown-hitachi-hiuxwe2 exit ;; 9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:*) echo hppa1.1-hp-bsd exit ;; 9000/8??:4.3bsd:*:*) echo hppa1.0-hp-bsd exit ;; *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*) echo hppa1.0-hp-mpeix exit ;; hp7??:OSF1:*:* | hp8?[79]:OSF1:*:*) echo hppa1.1-hp-osf exit ;; hp8??:OSF1:*:*) echo hppa1.0-hp-osf exit ;; i*86:OSF1:*:*) if [ -x /usr/sbin/sysversion ] ; then echo "$UNAME_MACHINE"-unknown-osf1mk else echo "$UNAME_MACHINE"-unknown-osf1 fi exit ;; parisc*:Lites*:*:*) echo hppa1.1-hp-lites exit ;; C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*) echo c1-convex-bsd |
︙ | ︙ | |||
765 766 767 768 769 770 771 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) | | | | | | | | | | | | | | | | | < > | > | | | | < < < < | | | | | < < < < < < < < < < < < | < < < | | | | | | | | | | | | | | | | > > > | | | | > > > | | | | | | > > > | | | | | | | | | | | > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > > | | | | | | | > > > > > > > | | | | | | | | > > > > > > | | | | | | | | | | > > > > > > > > | | > > > > > > > | | | | | < | | | | | | | | | 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 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 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 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 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 1273 1274 1275 1276 1277 1278 1279 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 1445 1446 1447 1448 1449 1450 1451 1452 1453 1454 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 | C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*) echo c38-convex-bsd exit ;; C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*) echo c4-convex-bsd exit ;; CRAY*Y-MP:*:*:*) echo ymp-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*[A-Z]90:*:*:*) echo "$UNAME_MACHINE"-cray-unicos"$UNAME_RELEASE" \ | sed -e 's/CRAY.*\([A-Z]90\)/\1/' \ -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \ -e 's/\.[^.]*$/.X/' exit ;; CRAY*TS:*:*:*) echo t90-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*T3E:*:*:*) echo alphaev5-cray-unicosmk"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; CRAY*SV1:*:*:*) echo sv1-cray-unicos"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; *:UNICOS/mp:*:*) echo craynv-cray-unicosmp"$UNAME_RELEASE" | sed -e 's/\.[^.]*$/.X/' exit ;; F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*) FUJITSU_PROC=`uname -m | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz` FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | sed -e 's/ /_/'` echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; 5000:UNIX_System_V:4.*:*) FUJITSU_SYS=`uname -p | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/\///'` FUJITSU_REL=`echo "$UNAME_RELEASE" | tr ABCDEFGHIJKLMNOPQRSTUVWXYZ abcdefghijklmnopqrstuvwxyz | sed -e 's/ /_/'` echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}" exit ;; i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*) echo "$UNAME_MACHINE"-pc-bsdi"$UNAME_RELEASE" exit ;; sparc*:BSD/OS:*:*) echo sparc-unknown-bsdi"$UNAME_RELEASE" exit ;; *:BSD/OS:*:*) echo "$UNAME_MACHINE"-unknown-bsdi"$UNAME_RELEASE" exit ;; *:FreeBSD:*:*) UNAME_PROCESSOR=`/usr/bin/uname -p` case "$UNAME_PROCESSOR" in amd64) UNAME_PROCESSOR=x86_64 ;; i386) UNAME_PROCESSOR=i586 ;; esac echo "$UNAME_PROCESSOR"-unknown-freebsd"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; i*:CYGWIN*:*) echo "$UNAME_MACHINE"-pc-cygwin exit ;; *:MINGW64*:*) echo "$UNAME_MACHINE"-pc-mingw64 exit ;; *:MINGW*:*) echo "$UNAME_MACHINE"-pc-mingw32 exit ;; *:MSYS*:*) echo "$UNAME_MACHINE"-pc-msys exit ;; i*:PW*:*) echo "$UNAME_MACHINE"-pc-pw32 exit ;; *:Interix*:*) case "$UNAME_MACHINE" in x86) echo i586-pc-interix"$UNAME_RELEASE" exit ;; authenticamd | genuineintel | EM64T) echo x86_64-unknown-interix"$UNAME_RELEASE" exit ;; IA64) echo ia64-unknown-interix"$UNAME_RELEASE" exit ;; esac ;; i*:UWIN*:*) echo "$UNAME_MACHINE"-pc-uwin exit ;; amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) echo x86_64-unknown-cygwin exit ;; prep*:SunOS:5.*:*) echo powerpcle-unknown-solaris2"`echo "$UNAME_RELEASE"|sed -e 's/[^.]*//'`" exit ;; *:GNU:*:*) # the GNU system echo "`echo "$UNAME_MACHINE"|sed -e 's,[-/].*$,,'`-unknown-$LIBC`echo "$UNAME_RELEASE"|sed -e 's,/.*$,,'`" exit ;; *:GNU/*:*:*) # other systems with GNU libc and userland echo "$UNAME_MACHINE-unknown-`echo "$UNAME_SYSTEM" | sed 's,^[^/]*/,,' | tr "[:upper:]" "[:lower:]"``echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`-$LIBC" exit ;; i*86:Minix:*:*) echo "$UNAME_MACHINE"-pc-minix exit ;; aarch64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; aarch64_be:Linux:*:*) UNAME_MACHINE=aarch64_be echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; alpha:Linux:*:*) case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in EV5) UNAME_MACHINE=alphaev5 ;; EV56) UNAME_MACHINE=alphaev56 ;; PCA56) UNAME_MACHINE=alphapca56 ;; PCA57) UNAME_MACHINE=alphapca56 ;; EV6) UNAME_MACHINE=alphaev6 ;; EV67) UNAME_MACHINE=alphaev67 ;; EV68*) UNAME_MACHINE=alphaev68 ;; esac objdump --private-headers /bin/sh | grep -q ld.so.1 if test "$?" = 0 ; then LIBC=gnulibc1 ; fi echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arc:Linux:*:* | arceb:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; arm*:Linux:*:*) eval "$set_cc_for_build" if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_EABI__ then echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" else if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \ | grep -q __ARM_PCS_VFP then echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabi else echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"eabihf fi fi exit ;; avr32*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; cris:Linux:*:*) echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; crisv32:Linux:*:*) echo "$UNAME_MACHINE"-axis-linux-"$LIBC" exit ;; e2k:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; frv:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; hexagon:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:Linux:*:*) echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; ia64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; k1om:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m32r*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; m68*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; mips:Linux:*:* | mips64:Linux:*:*) eval "$set_cc_for_build" sed 's/^ //' << EOF > "$dummy.c" #undef CPU #undef ${UNAME_MACHINE} #undef ${UNAME_MACHINE}el #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL) CPU=${UNAME_MACHINE}el #else #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB) CPU=${UNAME_MACHINE} #else CPU= #endif #endif EOF eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`" test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; } ;; mips64el:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; openrisc*:Linux:*:*) echo or1k-unknown-linux-"$LIBC" exit ;; or32:Linux:*:* | or1k*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; padre:Linux:*:*) echo sparc-unknown-linux-"$LIBC" exit ;; parisc64:Linux:*:* | hppa64:Linux:*:*) echo hppa64-unknown-linux-"$LIBC" exit ;; parisc:Linux:*:* | hppa:Linux:*:*) # Look for CPU level case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in PA7*) echo hppa1.1-unknown-linux-"$LIBC" ;; PA8*) echo hppa2.0-unknown-linux-"$LIBC" ;; *) echo hppa-unknown-linux-"$LIBC" ;; esac exit ;; ppc64:Linux:*:*) echo powerpc64-unknown-linux-"$LIBC" exit ;; ppc:Linux:*:*) echo powerpc-unknown-linux-"$LIBC" exit ;; ppc64le:Linux:*:*) echo powerpc64le-unknown-linux-"$LIBC" exit ;; ppcle:Linux:*:*) echo powerpcle-unknown-linux-"$LIBC" exit ;; riscv32:Linux:*:* | riscv64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; s390:Linux:*:* | s390x:Linux:*:*) echo "$UNAME_MACHINE"-ibm-linux-"$LIBC" exit ;; sh64*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sh*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; sparc:Linux:*:* | sparc64:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; tile*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; vax:Linux:*:*) echo "$UNAME_MACHINE"-dec-linux-"$LIBC" exit ;; x86_64:Linux:*:*) echo "$UNAME_MACHINE"-pc-linux-"$LIBC" exit ;; xtensa*:Linux:*:*) echo "$UNAME_MACHINE"-unknown-linux-"$LIBC" exit ;; i*86:DYNIX/ptx:4*:*) # ptx 4.0 does uname -s correctly, with DYNIX/ptx in there. # earlier versions are messed up and put the nodename in both # sysname and nodename. echo i386-sequent-sysv4 exit ;; i*86:UNIX_SV:4.2MP:2.*) # Unixware is an offshoot of SVR4, but it has its own version # number series starting with 2... # I am not positive that other SVR4 systems won't match this, # I just have to hope. -- rms. # Use sysv4.2uw... so that sysv4* matches it. echo "$UNAME_MACHINE"-pc-sysv4.2uw"$UNAME_VERSION" exit ;; i*86:OS/2:*:*) # If we were able to find `uname', then EMX Unix compatibility # is probably installed. echo "$UNAME_MACHINE"-pc-os2-emx exit ;; i*86:XTS-300:*:STOP) echo "$UNAME_MACHINE"-unknown-stop exit ;; i*86:atheos:*:*) echo "$UNAME_MACHINE"-unknown-atheos exit ;; i*86:syllable:*:*) echo "$UNAME_MACHINE"-pc-syllable exit ;; i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.[02]*:*) echo i386-unknown-lynxos"$UNAME_RELEASE" exit ;; i*86:*DOS:*:*) echo "$UNAME_MACHINE"-pc-msdosdjgpp exit ;; i*86:*:4.*:*) UNAME_REL=`echo "$UNAME_RELEASE" | sed 's/\/MP$//'` if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then echo "$UNAME_MACHINE"-univel-sysv"$UNAME_REL" else echo "$UNAME_MACHINE"-pc-sysv"$UNAME_REL" fi exit ;; i*86:*:5:[678]*) # UnixWare 7.x, OpenUNIX and OpenServer 6. case `/bin/uname -X | grep "^Machine"` in *486*) UNAME_MACHINE=i486 ;; *Pentium) UNAME_MACHINE=i586 ;; *Pent*|*Celeron) UNAME_MACHINE=i686 ;; esac echo "$UNAME_MACHINE-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}{$UNAME_VERSION}" exit ;; i*86:*:3.2:*) if test -f /usr/options/cb.name; then UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name` echo "$UNAME_MACHINE"-pc-isc"$UNAME_REL" elif /bin/uname -X 2>/dev/null >/dev/null ; then UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')` (/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486 (/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \ && UNAME_MACHINE=i586 (/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \ && UNAME_MACHINE=i686 (/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \ && UNAME_MACHINE=i686 echo "$UNAME_MACHINE"-pc-sco"$UNAME_REL" else echo "$UNAME_MACHINE"-pc-sysv32 fi exit ;; pc:*:*:*) # Left here for compatibility: # uname -m prints for DJGPP always 'pc', but it prints nothing about # the processor, so we play safe by assuming i586. # Note: whatever this is, it MUST be the same as what config.sub # prints for the "djgpp" host, or else GDB configure will decide that # this is a cross-build. echo i586-pc-msdosdjgpp exit ;; Intel:Mach:3*:*) echo i386-pc-mach3 exit ;; paragon:*:*:*) echo i860-intel-osf1 exit ;; i860:*:4.*:*) # i860-SVR4 if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then echo i860-stardent-sysv"$UNAME_RELEASE" # Stardent Vistra i860-SVR4 else # Add other i860-SVR4 vendors below as they are discovered. echo i860-unknown-sysv"$UNAME_RELEASE" # Unknown i860-SVR4 fi exit ;; mini*:CTIX:SYS*5:*) # "miniframe" echo m68010-convergent-sysv exit ;; mc68k:UNIX:SYSTEM5:3.51m) echo m68k-convergent-sysv exit ;; M680?0:D-NIX:5.3:*) echo m68k-diab-dnix exit ;; M68*:*:R3V[5678]*:*) test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;; 3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0) OS_REL='' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; 3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*) /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4; exit; } ;; NCR*:*:4.2:* | MPRAS*:*:4.2:*) OS_REL='.3' test -r /etc/.relid \ && OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid` /bin/uname -p 2>/dev/null | grep 86 >/dev/null \ && { echo i486-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } /bin/uname -p 2>/dev/null | /bin/grep pteron >/dev/null \ && { echo i586-ncr-sysv4.3"$OS_REL"; exit; } ;; m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*) echo m68k-unknown-lynxos"$UNAME_RELEASE" exit ;; mc68030:UNIX_System_V:4.*:*) echo m68k-atari-sysv4 exit ;; TSUNAMI:LynxOS:2.*:*) echo sparc-unknown-lynxos"$UNAME_RELEASE" exit ;; rs6000:LynxOS:2.*:*) echo rs6000-unknown-lynxos"$UNAME_RELEASE" exit ;; PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.[02]*:*) echo powerpc-unknown-lynxos"$UNAME_RELEASE" exit ;; SM[BE]S:UNIX_SV:*:*) echo mips-dde-sysv"$UNAME_RELEASE" exit ;; RM*:ReliantUNIX-*:*:*) echo mips-sni-sysv4 exit ;; RM*:SINIX-*:*:*) echo mips-sni-sysv4 exit ;; *:SINIX-*:*:*) if uname -p 2>/dev/null >/dev/null ; then UNAME_MACHINE=`(uname -p) 2>/dev/null` echo "$UNAME_MACHINE"-sni-sysv4 else echo ns32k-sni-sysv fi exit ;; PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort # says <Richard.M.Bartel@ccMail.Census.GOV> echo i586-unisys-sysv4 exit ;; *:UNIX_System_V:4*:FTX*) # From Gerald Hewes <hewes@openmarket.com>. # How about differentiating between stratus architectures? -djm echo hppa1.1-stratus-sysv4 exit ;; *:*:*:FTX*) # From seanf@swdc.stratus.com. echo i860-stratus-sysv4 exit ;; i*86:VOS:*:*) # From Paul.Green@stratus.com. echo "$UNAME_MACHINE"-stratus-vos exit ;; *:VOS:*:*) # From Paul.Green@stratus.com. echo hppa1.1-stratus-vos exit ;; mc68*:A/UX:*:*) echo m68k-apple-aux"$UNAME_RELEASE" exit ;; news*:NEWS-OS:6*:*) echo mips-sony-newsos6 exit ;; R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*) if [ -d /usr/nec ]; then echo mips-nec-sysv"$UNAME_RELEASE" else echo mips-unknown-sysv"$UNAME_RELEASE" fi exit ;; BeBox:BeOS:*:*) # BeOS running on hardware made by Be, PPC only. echo powerpc-be-beos exit ;; BeMac:BeOS:*:*) # BeOS running on Mac or Mac clone, PPC only. echo powerpc-apple-beos exit ;; BePC:BeOS:*:*) # BeOS running on Intel PC compatible. echo i586-pc-beos exit ;; BePC:Haiku:*:*) # Haiku running on Intel PC compatible. echo i586-pc-haiku exit ;; x86_64:Haiku:*:*) echo x86_64-unknown-haiku exit ;; SX-4:SUPER-UX:*:*) echo sx4-nec-superux"$UNAME_RELEASE" exit ;; SX-5:SUPER-UX:*:*) echo sx5-nec-superux"$UNAME_RELEASE" exit ;; SX-6:SUPER-UX:*:*) echo sx6-nec-superux"$UNAME_RELEASE" exit ;; SX-7:SUPER-UX:*:*) echo sx7-nec-superux"$UNAME_RELEASE" exit ;; SX-8:SUPER-UX:*:*) echo sx8-nec-superux"$UNAME_RELEASE" exit ;; SX-8R:SUPER-UX:*:*) echo sx8r-nec-superux"$UNAME_RELEASE" exit ;; SX-ACE:SUPER-UX:*:*) echo sxace-nec-superux"$UNAME_RELEASE" exit ;; Power*:Rhapsody:*:*) echo powerpc-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Rhapsody:*:*) echo "$UNAME_MACHINE"-apple-rhapsody"$UNAME_RELEASE" exit ;; *:Darwin:*:*) UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown eval "$set_cc_for_build" if test "$UNAME_PROCESSOR" = unknown ; then UNAME_PROCESSOR=powerpc fi if test "`echo "$UNAME_RELEASE" | sed -e 's/\..*//'`" -le 10 ; then if [ "$CC_FOR_BUILD" != no_compiler_found ]; then if (echo '#ifdef __LP64__'; echo IS_64BIT_ARCH; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_64BIT_ARCH >/dev/null then case $UNAME_PROCESSOR in i386) UNAME_PROCESSOR=x86_64 ;; powerpc) UNAME_PROCESSOR=powerpc64 ;; esac fi # On 10.4-10.6 one might compile for PowerPC via gcc -arch ppc if (echo '#ifdef __POWERPC__'; echo IS_PPC; echo '#endif') | \ (CCOPTS="" $CC_FOR_BUILD -E - 2>/dev/null) | \ grep IS_PPC >/dev/null then UNAME_PROCESSOR=powerpc fi fi elif test "$UNAME_PROCESSOR" = i386 ; then # Avoid executing cc on OS X 10.9, as it ships with a stub # that puts up a graphical alert prompting to install # developer tools. Any system running Mac OS X 10.7 or # later (Darwin 11 and later) is required to have a 64-bit # processor. This is not true of the ARM version of Darwin # that Apple uses in portable devices. UNAME_PROCESSOR=x86_64 fi echo "$UNAME_PROCESSOR"-apple-darwin"$UNAME_RELEASE" exit ;; *:procnto*:*:* | *:QNX:[0123456789]*:*) UNAME_PROCESSOR=`uname -p` if test "$UNAME_PROCESSOR" = x86; then UNAME_PROCESSOR=i386 UNAME_MACHINE=pc fi echo "$UNAME_PROCESSOR"-"$UNAME_MACHINE"-nto-qnx"$UNAME_RELEASE" exit ;; *:QNX:*:4*) echo i386-pc-qnx exit ;; NEO-*:NONSTOP_KERNEL:*:*) echo neo-tandem-nsk"$UNAME_RELEASE" exit ;; NSE-*:NONSTOP_KERNEL:*:*) echo nse-tandem-nsk"$UNAME_RELEASE" exit ;; NSR-*:NONSTOP_KERNEL:*:*) echo nsr-tandem-nsk"$UNAME_RELEASE" exit ;; NSV-*:NONSTOP_KERNEL:*:*) echo nsv-tandem-nsk"$UNAME_RELEASE" exit ;; NSX-*:NONSTOP_KERNEL:*:*) echo nsx-tandem-nsk"$UNAME_RELEASE" exit ;; *:NonStop-UX:*:*) echo mips-compaq-nonstopux exit ;; BS2000:POSIX*:*:*) echo bs2000-siemens-sysv exit ;; DS/*:UNIX_System_V:*:*) echo "$UNAME_MACHINE"-"$UNAME_SYSTEM"-"$UNAME_RELEASE" exit ;; *:Plan9:*:*) # "uname -m" is not consistent, so use $cputype instead. 386 # is converted to i386 for consistency with other x86 # operating systems. if test "$cputype" = 386; then UNAME_MACHINE=i386 else UNAME_MACHINE="$cputype" fi echo "$UNAME_MACHINE"-unknown-plan9 exit ;; *:TOPS-10:*:*) echo pdp10-unknown-tops10 exit ;; *:TENEX:*:*) echo pdp10-unknown-tenex exit ;; KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*) echo pdp10-dec-tops20 exit ;; XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*) echo pdp10-xkl-tops20 exit ;; *:TOPS-20:*:*) echo pdp10-unknown-tops20 exit ;; *:ITS:*:*) echo pdp10-unknown-its exit ;; SEI:*:*:SEIUX) echo mips-sei-seiux"$UNAME_RELEASE" exit ;; *:DragonFly:*:*) echo "$UNAME_MACHINE"-unknown-dragonfly"`echo "$UNAME_RELEASE"|sed -e 's/[-(].*//'`" exit ;; *:*VMS:*:*) UNAME_MACHINE=`(uname -p) 2>/dev/null` case "$UNAME_MACHINE" in A*) echo alpha-dec-vms ; exit ;; I*) echo ia64-dec-vms ; exit ;; V*) echo vax-dec-vms ; exit ;; esac ;; *:XENIX:*:SysV) echo i386-pc-xenix exit ;; i*86:skyos:*:*) echo "$UNAME_MACHINE"-pc-skyos"`echo "$UNAME_RELEASE" | sed -e 's/ .*$//'`" exit ;; i*86:rdos:*:*) echo "$UNAME_MACHINE"-pc-rdos exit ;; i*86:AROS:*:*) echo "$UNAME_MACHINE"-pc-aros exit ;; x86_64:VMkernel:*:*) echo "$UNAME_MACHINE"-unknown-esx exit ;; amd64:Isilon\ OneFS:*:*) echo x86_64-unknown-onefs exit ;; esac echo "$0: unable to guess system type" >&2 case "$UNAME_MACHINE:$UNAME_SYSTEM" in mips:Linux | mips64:Linux) # If we got here on MIPS GNU/Linux, output extra information. cat >&2 <<EOF NOTE: MIPS GNU/Linux systems require a C compiler to fully recognize the system type. Please install a C compiler and try again. EOF ;; esac cat >&2 <<EOF This script (version $timestamp), has failed to recognize the operating system you are using. If your script is old, overwrite *all* copies of config.guess and config.sub with the latest versions from: https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess and https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub If $0 has already been updated, send the following data and any information you think might be pertinent to config-patches@gnu.org to provide the necessary information to handle your system. config.guess timestamp = $timestamp uname -m = `(uname -m) 2>/dev/null || echo unknown` uname -r = `(uname -r) 2>/dev/null || echo unknown` uname -s = `(uname -s) 2>/dev/null || echo unknown` uname -v = `(uname -v) 2>/dev/null || echo unknown` /usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null` /bin/uname -X = `(/bin/uname -X) 2>/dev/null` hostinfo = `(hostinfo) 2>/dev/null` /bin/universe = `(/bin/universe) 2>/dev/null` /usr/bin/arch -k = `(/usr/bin/arch -k) 2>/dev/null` /bin/arch = `(/bin/arch) 2>/dev/null` /usr/bin/oslevel = `(/usr/bin/oslevel) 2>/dev/null` /usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null` UNAME_MACHINE = "$UNAME_MACHINE" UNAME_RELEASE = "$UNAME_RELEASE" UNAME_SYSTEM = "$UNAME_SYSTEM" UNAME_VERSION = "$UNAME_VERSION" EOF exit 1 # Local variables: # eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: |
Changes to autosetup/autosetup-config.sub.
1 2 | #! /bin/sh # Configuration validation subroutine script. | | | | | | < | | | 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 | #! /bin/sh # Configuration validation subroutine script. # Copyright 1992-2018 Free Software Foundation, Inc. timestamp='2018-03-08' # This file is free software; you can redistribute it and/or modify it # under the terms of the GNU General Public License as published by # the Free Software Foundation; either version 3 of the License, or # (at your option) any later version. # # This program is distributed in the hope that it will be useful, but # WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # General Public License for more details. # # You should have received a copy of the GNU General Public License # along with this program; if not, see <https://www.gnu.org/licenses/>. # # As a special exception to the GNU General Public License, if you # distribute this file as part of a program that contains a # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that # program. This Exception is an additional permission under section 7 # of the GNU General Public License, version 3 ("GPLv3"). # Please send patches to <config-patches@gnu.org>. # # Configuration subroutine to validate and canonicalize a configuration type. # Supply the specified configuration type as an argument. # If it is invalid, we print an error message on stderr and exit with code 1. # Otherwise, we print the canonical config type on stdout and succeed. # You can get the latest version of this script from: # https://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub # This file is supposed to be the same for all GNU packages # and recognize all the CPU types, system types and aliases # that are meaningful with *any* GNU software. # Each package is responsible for reporting which valid configurations # it does not support. The user should be able to distinguish # a failure to support a valid configuration from a meaningless # configuration. # The goal of this file is to map all the various variations of a given # machine specification into a single specification in the form: # CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM # or in some cases, the newer four-part form: # CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM # It is wrong to echo any other type of specification. me=`echo "$0" | sed -e 's,.*/,,'` usage="\ Usage: $0 [OPTION] CPU-MFR-OPSYS or ALIAS Canonicalize a configuration name. Options: -h, --help print this help, then exit -t, --time-stamp print date of last modification, then exit -v, --version print version number, then exit Report bugs and patches to <config-patches@gnu.org>." version="\ GNU config.sub ($timestamp) Copyright 1992-2018 Free Software Foundation, Inc. This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." help=" Try \`$me --help' for more information." |
︙ | ︙ | |||
91 92 93 94 95 96 97 | break ;; -* ) echo "$me: invalid option $1$help" exit 1 ;; *local*) # First pass through any local machine types. | | | | | | | | | | | 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 | break ;; -* ) echo "$me: invalid option $1$help" exit 1 ;; *local*) # First pass through any local machine types. echo "$1" exit ;; * ) break ;; esac done case $# in 0) echo "$me: missing argument$help" >&2 exit 1;; 1) ;; *) echo "$me: too many arguments$help" >&2 exit 1;; esac # Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any). # Here we must recognize all the valid KERNEL-OS combinations. maybe_os=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` case $maybe_os in nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \ linux-musl* | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \ knetbsd*-gnu* | netbsd*-gnu* | netbsd*-eabi* | \ kopensolaris*-gnu* | cloudabi*-eabi* | \ storm-chaos* | os2-emx* | rtmk-nova*) os=-$maybe_os basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` ;; android-linux) os=-linux-android basic_machine=`echo "$1" | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown ;; *) basic_machine=`echo "$1" | sed 's/-[^-]*$//'` if [ "$basic_machine" != "$1" ] then os=`echo "$1" | sed 's/.*-/-/'` else os=; fi ;; esac ### Let's recognize common machines as not being operating systems so ### that things like config.sub decstation-3100 work. We also ### recognize some manufacturers as not being operating systems, so we |
︙ | ︙ | |||
175 176 177 178 179 180 181 | basic_machine=$1 ;; -hiux*) os=-hiuxwe2 ;; -sco6) os=-sco5v6 | | | | | | | | | | | | < < < | 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 | basic_machine=$1 ;; -hiux*) os=-hiuxwe2 ;; -sco6) os=-sco5v6 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5) os=-sco3.2v5 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco4) os=-sco3.2v4 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2.[4-9]*) os=`echo $os | sed -e 's/sco3.2./sco3.2v/'` basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco3.2v[4-9]*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco5v6*) # Don't forget version if it is 3.2v4 or newer. basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -sco*) os=-sco3.2v2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -udk*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -isc) os=-isc2.2 basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -clix*) basic_machine=clipper-intergraph ;; -isc*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-pc/'` ;; -lynx*178) os=-lynxos178 ;; -lynx*5) os=-lynxos5 ;; -lynx*) os=-lynxos ;; -ptx*) basic_machine=`echo "$1" | sed -e 's/86-.*/86-sequent/'` ;; -psos*) os=-psos ;; -mint | -mint[0-9]*) basic_machine=m68k-atari os=-mint |
︙ | ︙ | |||
251 252 253 254 255 256 257 258 259 260 261 | | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | > | | | | 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 | | aarch64 | aarch64_be \ | alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \ | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ | am33_2.0 \ | arc | arceb \ | arm | arm[bl]e | arme[lb] | armv[2-8] | armv[3-8][lb] | armv7[arm] \ | avr | avr32 \ | ba \ | be32 | be64 \ | bfin \ | c4x | c8051 | clipper \ | d10v | d30v | dlx | dsp16xx \ | e2k | epiphany \ | fido | fr30 | frv | ft32 \ | h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \ | hexagon \ | i370 | i860 | i960 | ia16 | ia64 \ | ip2k | iq2000 \ | k1om \ | le32 | le64 \ | lm32 \ | m32c | m32r | m32rle | m68000 | m68k | m88k \ | maxq | mb | microblaze | microblazeel | mcore | mep | metag \ | mips | mipsbe | mipseb | mipsel | mipsle \ |
︙ | ︙ | |||
295 296 297 298 299 300 301 | | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ | | > | | | | 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 | | moxie \ | mt \ | msp430 \ | nds32 | nds32le | nds32be \ | nios | nios2 | nios2eb | nios2el \ | ns16k | ns32k \ | open8 | or1k | or1knd | or32 \ | pdp10 | pj | pjl \ | powerpc | powerpc64 | powerpc64le | powerpcle \ | pru \ | pyramid \ | riscv32 | riscv64 \ | rl78 | rx \ | score \ | sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[234]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ | sh64 | sh64le \ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ | spu \ | tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \ | ubicom32 \ | v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \ | visium \ | wasm32 \ | x86 | xc16x | xstormy16 | xtensa \ | z8k | z80) basic_machine=$basic_machine-unknown ;; c54x) basic_machine=tic54x-unknown ;; c55x) basic_machine=tic55x-unknown ;; c6x) basic_machine=tic6x-unknown ;; leon|leon[3-9]) basic_machine=sparc-$basic_machine ;; m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | nvptx | picochip) basic_machine=$basic_machine-unknown os=-none ;; m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65) ;; ms1) basic_machine=mt-unknown ;; strongarm | thumb | xscale) basic_machine=arm-unknown |
︙ | ︙ | |||
360 361 362 363 364 365 366 | # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. *-*-*) | | > | | | 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 | # because (1) that's what they normally are, and # (2) the word "unknown" tends to confuse beginning users. i*86 | x86_64) basic_machine=$basic_machine-pc ;; # Object if more than one company name word. *-*-*) echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; # Recognize the basic CPU types with company name. 580-* \ | a29k-* \ | aarch64-* | aarch64_be-* \ | alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \ | alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \ | alphapca5[67]-* | alpha64pca5[67]-* | arc-* | arceb-* \ | arm-* | armbe-* | armle-* | armeb-* | armv*-* \ | avr-* | avr32-* \ | ba-* \ | be32-* | be64-* \ | bfin-* | bs2000-* \ | c[123]* | c30-* | [cjt]90-* | c4x-* \ | c8051-* | clipper-* | craynv-* | cydra-* \ | d10v-* | d30v-* | dlx-* \ | e2k-* | elxsi-* \ | f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \ | h8300-* | h8500-* \ | hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \ | hexagon-* \ | i*86-* | i860-* | i960-* | ia16-* | ia64-* \ | ip2k-* | iq2000-* \ | k1om-* \ | le32-* | le64-* \ | lm32-* \ | m32c-* | m32r-* | m32rle-* \ | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ | m88110-* | m88k-* | maxq-* | mcore-* | metag-* \ |
︙ | ︙ | |||
423 424 425 426 427 428 429 430 431 432 433 434 435 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pyramid-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | > > | > | | 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 | | nios-* | nios2-* | nios2eb-* | nios2el-* \ | none-* | np1-* | ns16k-* | ns32k-* \ | open8-* \ | or1k*-* \ | orion-* \ | pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \ | powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \ | pru-* \ | pyramid-* \ | riscv32-* | riscv64-* \ | rl78-* | romp-* | rs6000-* | rx-* \ | sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ | sparclite-* \ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx*-* \ | tahoe-* \ | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ | tile*-* \ | tron-* \ | ubicom32-* \ | v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \ | vax-* \ | visium-* \ | wasm32-* \ | we32k-* \ | x86-* | x86_64-* | xc16x-* | xps100-* \ | xstormy16-* | xtensa*-* \ | ymp-* \ | z8k-* | z80-*) ;; # Recognize the basic CPU types without company name, with glob match. xtensa*) basic_machine=$basic_machine-unknown ;; # Recognize the various machine names and aliases which stand # for a CPU type and a company and sometimes even an OS. 386bsd) basic_machine=i386-pc os=-bsd ;; 3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc) basic_machine=m68000-att ;; 3b*) basic_machine=we32k-att |
︙ | ︙ | |||
485 486 487 488 489 490 491 | basic_machine=a29k-none os=-bsd ;; amd64) basic_machine=x86_64-pc ;; amd64-*) | | | 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 | basic_machine=a29k-none os=-bsd ;; amd64) basic_machine=x86_64-pc ;; amd64-*) basic_machine=x86_64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; amdahl) basic_machine=580-amdahl os=-sysv ;; amiga | amiga-*) basic_machine=m68k-unknown |
︙ | ︙ | |||
514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 | basic_machine=m68k-apollo os=-bsd ;; aros) basic_machine=i386-pc os=-aros ;; aux) basic_machine=m68k-apple os=-aux ;; balance) basic_machine=ns32k-sequent os=-dynix ;; blackfin) basic_machine=bfin-unknown os=-linux ;; blackfin-*) | > > > | | | | | 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 | basic_machine=m68k-apollo os=-bsd ;; aros) basic_machine=i386-pc os=-aros ;; asmjs) basic_machine=asmjs-unknown ;; aux) basic_machine=m68k-apple os=-aux ;; balance) basic_machine=ns32k-sequent os=-dynix ;; blackfin) basic_machine=bfin-unknown os=-linux ;; blackfin-*) basic_machine=bfin-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; bluegene*) basic_machine=powerpc-ibm os=-cnk ;; c54x-*) basic_machine=tic54x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c55x-*) basic_machine=tic55x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c6x-*) basic_machine=tic6x-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; c90) basic_machine=c90-cray os=-unicos ;; cegcc) basic_machine=arm-unknown |
︙ | ︙ | |||
630 631 632 633 634 635 636 | basic_machine=i586-pc os=-msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx ;; | | > > > > > > > > | 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 | basic_machine=i586-pc os=-msdosdjgpp ;; dpx20 | dpx20-*) basic_machine=rs6000-bull os=-bosx ;; dpx2*) basic_machine=m68k-bull os=-sysv3 ;; e500v[12]) basic_machine=powerpc-unknown os=$os"spe" ;; e500v[12]-*) basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=$os"spe" ;; ebmon29k) basic_machine=a29k-amd os=-ebmon ;; elxsi) basic_machine=elxsi-elxsi os=-bsd |
︙ | ︙ | |||
723 724 725 726 727 728 729 | ;; hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; | < < < | | | | | | | < < < | 736 737 738 739 740 741 742 743 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 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 | ;; hp9k8[0-9][13679] | hp8[0-9][13679]) basic_machine=hppa1.1-hp ;; hp9k8[0-9][0-9] | hp8[0-9][0-9]) basic_machine=hppa1.0-hp ;; hppaosf) basic_machine=hppa1.1-hp os=-osf ;; hppro) basic_machine=hppa1.1-hp os=-proelf ;; i370-ibm* | ibm*) basic_machine=i370-ibm ;; i*86v32) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv32 ;; i*86v4*) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv4 ;; i*86v) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-sysv ;; i*86sol2) basic_machine=`echo "$1" | sed -e 's/86.*/86-pc/'` os=-solaris2 ;; i386mach) basic_machine=i386-mach os=-mach ;; vsta) basic_machine=i386-unknown os=-vsta ;; iris | iris4d) basic_machine=mips-sgi case $os in -irix*) ;; *) os=-irix4 ;; esac ;; isi68 | isi) basic_machine=m68k-isi os=-sysv ;; leon-*|leon[3-9]-*) basic_machine=sparc-`echo "$basic_machine" | sed 's/-.*//'` ;; m68knommu) basic_machine=m68k-unknown os=-linux ;; m68knommu-*) basic_machine=m68k-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; magnum | m3230) basic_machine=mips-mips os=-sysv ;; merlin) basic_machine=ns32k-utek os=-sysv |
︙ | ︙ | |||
820 821 822 823 824 825 826 | basic_machine=m68000-convergent ;; *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; mips3*-*) | | | | | 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 | basic_machine=m68000-convergent ;; *mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*) basic_machine=m68k-atari os=-mint ;; mips3*-*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'` ;; mips3*) basic_machine=`echo "$basic_machine" | sed -e 's/mips3/mips64/'`-unknown ;; monitor) basic_machine=m68k-rom68k os=-coff ;; morphos) basic_machine=powerpc-unknown os=-morphos ;; moxiebox) basic_machine=moxie-unknown os=-moxiebox ;; msdos) basic_machine=i386-pc os=-msdos ;; ms1-*) basic_machine=`echo "$basic_machine" | sed -e 's/ms1-/mt-/'` ;; msys) basic_machine=i686-pc os=-msys ;; mvs) basic_machine=i370-ibm |
︙ | ︙ | |||
884 885 886 887 888 889 890 | basic_machine=mips-sony os=-newsos ;; necv70) basic_machine=v70-nec os=-sysv ;; | | | 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 | basic_machine=mips-sony os=-newsos ;; necv70) basic_machine=v70-nec os=-sysv ;; next | m*-next) basic_machine=m68k-next case $os in -nextstep* ) ;; -ns2*) os=-nextstep2 ;; |
︙ | ︙ | |||
929 930 931 932 933 934 935 936 937 938 939 940 941 942 | ;; nse-tandem) basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; | > > > > > > | 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 | ;; nse-tandem) basic_machine=nse-tandem ;; nsr-tandem) basic_machine=nsr-tandem ;; nsv-tandem) basic_machine=nsv-tandem ;; nsx-tandem) basic_machine=nsx-tandem ;; op50n-* | op60c-*) basic_machine=hppa1.1-oki os=-proelf ;; openrisc | openrisc-*) basic_machine=or32-unknown ;; |
︙ | ︙ | |||
961 962 963 964 965 966 967 | os=-osf ;; parisc) basic_machine=hppa-unknown os=-linux ;; parisc-*) | | | | | | | | | | | | | | 974 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 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 | os=-osf ;; parisc) basic_machine=hppa-unknown os=-linux ;; parisc-*) basic_machine=hppa-`echo "$basic_machine" | sed 's/^[^-]*-//'` os=-linux ;; pbd) basic_machine=sparc-tti ;; pbb) basic_machine=m68k-tti ;; pc532 | pc532-*) basic_machine=ns32k-pc532 ;; pc98) basic_machine=i386-pc ;; pc98-*) basic_machine=i386-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium | p5 | k5 | k6 | nexgen | viac3) basic_machine=i586-pc ;; pentiumpro | p6 | 6x86 | athlon | athlon_*) basic_machine=i686-pc ;; pentiumii | pentium2 | pentiumiii | pentium3) basic_machine=i686-pc ;; pentium4) basic_machine=i786-pc ;; pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*) basic_machine=i586-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumpro-* | p6-* | 6x86-* | athlon-*) basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*) basic_machine=i686-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pentium4-*) basic_machine=i786-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; pn) basic_machine=pn-gould ;; power) basic_machine=power-ibm ;; ppc | ppcbe) basic_machine=powerpc-unknown ;; ppc-* | ppcbe-*) basic_machine=powerpc-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppcle | powerpclittle) basic_machine=powerpcle-unknown ;; ppcle-* | powerpclittle-*) basic_machine=powerpcle-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64) basic_machine=powerpc64-unknown ;; ppc64-*) basic_machine=powerpc64-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ppc64le | powerpc64little) basic_machine=powerpc64le-unknown ;; ppc64le-* | powerpc64little-*) basic_machine=powerpc64le-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; ps2) basic_machine=i386-ibm ;; pw32) basic_machine=i586-unknown os=-pw32 |
︙ | ︙ | |||
1081 1082 1083 1084 1085 1086 1087 | sei) basic_machine=mips-sei os=-seiux ;; sequent) basic_machine=i386-sequent ;; | < < < < < < < | | | 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 | sei) basic_machine=mips-sei os=-seiux ;; sequent) basic_machine=i386-sequent ;; sh5el) basic_machine=sh5le-unknown ;; simso-wrs) basic_machine=sparclite-wrs os=-vxworks ;; sps7) basic_machine=m68k-bull os=-sysv2 ;; spur) basic_machine=spur-unknown ;; st2000) basic_machine=m68k-tandem ;; stratus) basic_machine=i860-stratus os=-sysv4 ;; strongarm-* | thumb-*) basic_machine=arm-`echo "$basic_machine" | sed 's/^[^-]*-//'` ;; sun2) basic_machine=m68000-sun ;; sun2os3) basic_machine=m68000-sun os=-sunos3 |
︙ | ︙ | |||
1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 | basic_machine=w65-wdc os=-none ;; w89k-*) basic_machine=hppa1.1-winbond os=-proelf ;; xbox) basic_machine=i686-pc os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) | > > > | < < < < < < < < | 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 | basic_machine=w65-wdc os=-none ;; w89k-*) basic_machine=hppa1.1-winbond os=-proelf ;; x64) basic_machine=x86_64-pc ;; xbox) basic_machine=i686-pc os=-mingw32 ;; xps | xps100) basic_machine=xps100-honeywell ;; xscale-* | xscalee[bl]-*) basic_machine=`echo "$basic_machine" | sed 's/^xscale/arm/'` ;; ymp) basic_machine=ymp-cray os=-unicos ;; none) basic_machine=none-none os=-none ;; # Here we handle the default manufacturer of certain CPU types. It is in # some cases the only manufacturer, in others, it is the most popular. |
︙ | ︙ | |||
1282 1283 1284 1285 1286 1287 1288 | ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; | < < < < < < < | | | | | < < < > > > > | | | | | | | | | | | > > | | | | | < < < < < < | 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 1399 1400 1401 1402 1403 1404 1405 1406 1407 1408 1409 1410 1411 1412 1413 1414 1415 1416 1417 1418 1419 1420 1421 1422 1423 1424 1425 1426 1427 1428 1429 1430 1431 1432 1433 1434 1435 1436 1437 1438 1439 1440 1441 1442 1443 1444 | ;; rs6000) basic_machine=rs6000-ibm ;; vax) basic_machine=vax-dec ;; pdp11) basic_machine=pdp11-dec ;; we32k) basic_machine=we32k-att ;; sh[1234] | sh[24]a | sh[24]aeb | sh[34]eb | sh[1234]le | sh[23]ele) basic_machine=sh-unknown ;; cydra) basic_machine=cydra-cydrome ;; orion) basic_machine=orion-highlevel ;; orion105) basic_machine=clipper-highlevel ;; mac | mpw | mac-mpw) basic_machine=m68k-apple ;; pmac | pmac-mpw) basic_machine=powerpc-apple ;; *-unknown) # Make sure to match an already-canonicalized machine name. ;; *) echo Invalid configuration \`"$1"\': machine \`"$basic_machine"\' not recognized 1>&2 exit 1 ;; esac # Here we canonicalize certain aliases for manufacturers. case $basic_machine in *-digital*) basic_machine=`echo "$basic_machine" | sed 's/digital.*/dec/'` ;; *-commodore*) basic_machine=`echo "$basic_machine" | sed 's/commodore.*/cbm/'` ;; *) ;; esac # Decode manufacturer-specific aliases for certain operating systems. if [ x"$os" != x"" ] then case $os in # First match some system type aliases that might get confused # with valid system types. # -solaris* is a basic system type, with this one exception. -auroraux) os=-auroraux ;; -solaris1 | -solaris1.*) os=`echo $os | sed -e 's|solaris1|sunos4|'` ;; -solaris) os=-solaris2 ;; -unixware*) os=-sysv4.2uw ;; -gnu/linux*) os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'` ;; # es1800 is here to avoid being matched by es* (a different OS) -es1800*) os=-ose ;; # Now accept the basic system types. # The portable systems comes first. # Each alternative MUST end in a * to match a version number. # -sysv* is not here because it comes later, after sysvr4. -gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \ | -*vms* | -sco* | -esix* | -isc* | -aix* | -cnk* | -sunos | -sunos[34]*\ | -hpux* | -unos* | -osf* | -luna* | -dgux* | -auroraux* | -solaris* \ | -sym* | -kopensolaris* | -plan9* \ | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \ | -aos* | -aros* | -cloudabi* | -sortix* \ | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ | -hiux* | -knetbsd* | -mirbsd* | -netbsd* \ | -bitrig* | -openbsd* | -solidbsd* | -libertybsd* \ | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \ | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* | -hcos* \ | -chorusos* | -chorusrdb* | -cegcc* | -glidix* \ | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ | -midipix* | -mingw32* | -mingw64* | -linux-gnu* | -linux-android* \ | -linux-newlib* | -linux-musl* | -linux-uclibc* \ | -uxpv* | -beos* | -mpeix* | -udk* | -moxiebox* \ | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* \ | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \ | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \ | -morphos* | -superux* | -rtmk* | -windiss* \ | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ | -skyos* | -haiku* | -rdos* | -toppers* | -drops* | -es* \ | -onefs* | -tirtos* | -phoenix* | -fuchsia* | -redox* | -bme* \ | -midnightbsd*) # Remember, each alternative MUST END IN *, to match a version number. ;; -qnx*) case $basic_machine in x86-* | i*86-*) ;; *) os=-nto$os ;; esac ;; -nto-qnx*) ;; -nto*) os=`echo $os | sed -e 's|nto|nto-qnx|'` ;; -sim | -xray | -os68k* | -v88r* \ | -windows* | -osx | -abug | -netware* | -os9* \ | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*) ;; -mac*) os=`echo "$os" | sed -e 's|mac|macos|'` ;; -linux-dietlibc) os=-linux-dietlibc ;; -linux*) os=`echo $os | sed -e 's|linux|linux-gnu|'` ;; -sunos5*) os=`echo "$os" | sed -e 's|sunos5|solaris2|'` ;; -sunos6*) os=`echo "$os" | sed -e 's|sunos6|solaris3|'` ;; -opened*) os=-openedition ;; -os400*) os=-os400 ;; -wince*) os=-wince ;; -utek*) os=-bsd ;; -dynix*) os=-bsd ;; -acis*) |
︙ | ︙ | |||
1464 1465 1466 1467 1468 1469 1470 | ;; -ctix* | -uts*) os=-sysv ;; -nova*) os=-rtmk-nova ;; | | | 1455 1456 1457 1458 1459 1460 1461 1462 1463 1464 1465 1466 1467 1468 1469 | ;; -ctix* | -uts*) os=-sysv ;; -nova*) os=-rtmk-nova ;; -ns2) os=-nextstep2 ;; -nsk*) os=-nsk ;; # Preserve the version number of sinix5. -sinix5.*) |
︙ | ︙ | |||
1486 1487 1488 1489 1490 1491 1492 | ;; -triton*) os=-sysv3 ;; -oss*) os=-sysv3 ;; | | < < < < < < < < < > > > > > > > > > > > > > > > | | 1477 1478 1479 1480 1481 1482 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 | ;; -triton*) os=-sysv3 ;; -oss*) os=-sysv3 ;; -svr4*) os=-sysv4 ;; -svr3) os=-sysv3 ;; -sysvr4) os=-sysv4 ;; # This must come after -sysvr4. -sysv*) ;; -ose*) os=-ose ;; -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) os=-mint ;; -zvmoe) os=-zvmoe ;; -dicos*) os=-dicos ;; -pikeos*) # Until real need of OS specific support for # particular features comes up, bare metal # configurations are quite functional. case $basic_machine in arm*) os=-eabi ;; *) os=-elf ;; esac ;; -nacl*) ;; -ios) ;; -none) ;; *) # Get rid of the `-' at the beginning of $os. os=`echo $os | sed 's/[^-]*-//'` echo Invalid configuration \`"$1"\': system \`"$os"\' not recognized 1>&2 exit 1 ;; esac else # Here we handle the default operating systems that come with various machines. # The value should be what the vendor currently ships out the door with their |
︙ | ︙ | |||
1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 | ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; *-be) os=-beos ;; | > > > < < < | 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 1624 1625 1626 1627 1628 1629 1630 1631 1632 | ;; *-tti) # must be before sparc entry or we get the wrong os. os=-sysv3 ;; sparc-* | *-sun) os=-sunos4.1.1 ;; pru-*) os=-elf ;; *-be) os=-beos ;; *-ibm) os=-aix ;; *-knuth) os=-mmixware ;; *-wec) |
︙ | ︙ | |||
1661 1662 1663 1664 1665 1666 1667 | ;; m68k-ccur) os=-rtu ;; m88k-omron*) os=-luna ;; | | < < < | 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 | ;; m68k-ccur) os=-rtu ;; m88k-omron*) os=-luna ;; *-next) os=-nextstep ;; *-sequent) os=-ptx ;; *-crds) os=-unos ;; *-ns) os=-genix ;; i370-*) os=-mvs ;; *-gould) os=-sysv ;; *-highlevel) os=-bsd ;; *-encore) |
︙ | ︙ | |||
1788 1789 1790 1791 1792 1793 1794 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac | | | | | 1782 1783 1784 1785 1786 1787 1788 1789 1790 1791 1792 1793 1794 1795 1796 1797 1798 1799 1800 1801 | -*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*) vendor=atari ;; -vos*) vendor=stratus ;; esac basic_machine=`echo "$basic_machine" | sed "s/unknown/$vendor/"` ;; esac echo "$basic_machine$os" exit # Local variables: # eval: (add-hook 'before-save-hook 'time-stamp) # time-stamp-start: "timestamp='" # time-stamp-format: "%:y-%02m-%02d" # time-stamp-end: "'" # End: |
Changes to autosetup/cc-lib.tcl.
︙ | ︙ | |||
8 9 10 11 12 13 14 | use cc module-options {} # @cc-check-lfs # # The equivalent of the 'AC_SYS_LARGEFILE' macro. | | | 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 | use cc module-options {} # @cc-check-lfs # # The equivalent of the 'AC_SYS_LARGEFILE' macro. # # defines 'HAVE_LFS' if LFS is available, # and defines '_FILE_OFFSET_BITS=64' if necessary # # Returns 1 if 'LFS' is available or 0 otherwise # proc cc-check-lfs {} { cc-check-includes sys/types.h |
︙ | ︙ | |||
34 35 36 37 38 39 40 | define-feature lfs $lfs return $lfs } # @cc-check-endian # # The equivalent of the 'AC_C_BIGENDIAN' macro. | | | 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 | define-feature lfs $lfs return $lfs } # @cc-check-endian # # The equivalent of the 'AC_C_BIGENDIAN' macro. # # defines 'HAVE_BIG_ENDIAN' if endian is known to be big, # or 'HAVE_LITTLE_ENDIAN' if endian is known to be little. # # Returns 1 if determined, or 0 if not. # proc cc-check-endian {} { cc-check-includes sys/types.h sys/param.h |
︙ | ︙ |
Changes to autosetup/cc-shared.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # @synopsis: # # The 'cc-shared' module provides support for shared libraries and shared objects. # It defines the following variables: # ## SH_CFLAGS Flags to use compiling sources destined for a shared library ## SH_LDFLAGS Flags to use linking (creating) a shared library ## SH_SOPREFIX Prefix to use to set the soname when creating a shared library ## SH_SOEXT Extension for shared libs ## SH_SOEXTVER Format for versioned shared libs - %s = version ## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object ## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed ## SHOBJ_LDFLAGS_R - as above, but all symbols must be resolved ## SH_LINKFLAGS Flags to use linking an executable which will load shared objects ## LD_LIBRARY_PATH Environment variable which specifies path to shared libraries ## STRIPLIBFLAGS Arguments to strip a dynamic library module-options {} # Defaults: gcc on unix | > > | | > > > | < < < < | | 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 | # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # @synopsis: # # The 'cc-shared' module provides support for shared libraries and shared objects. # It defines the following variables: # ## SH_CFLAGS Flags to use compiling sources destined for a shared library ## SH_LDFLAGS Flags to use linking (creating) a shared library ## SH_SOPREFIX Prefix to use to set the soname when creating a shared library ## SH_SOFULLPATH Set to 1 if the shared library soname should include the full install path ## SH_SOEXT Extension for shared libs ## SH_SOEXTVER Format for versioned shared libs - %s = version ## SHOBJ_CFLAGS Flags to use compiling sources destined for a shared object ## SHOBJ_LDFLAGS Flags to use linking a shared object, undefined symbols allowed ## SHOBJ_LDFLAGS_R - as above, but all symbols must be resolved ## SH_LINKRPATH Format for setting the rpath when linking an executable, %s = path ## SH_LINKFLAGS Flags to use linking an executable which will load shared objects ## LD_LIBRARY_PATH Environment variable which specifies path to shared libraries ## STRIPLIBFLAGS Arguments to strip a dynamic library module-options {} # Defaults: gcc on unix define SHOBJ_CFLAGS -fPIC define SHOBJ_LDFLAGS -shared define SH_CFLAGS -fPIC define SH_LDFLAGS -shared define SH_LINKFLAGS -rdynamic define SH_LINKRPATH "-Wl,-rpath -Wl,%s" define SH_SOEXT .so define SH_SOEXTVER .so.%s define SH_SOPREFIX -Wl,-soname, define LD_LIBRARY_PATH LD_LIBRARY_PATH define STRIPLIBFLAGS --strip-unneeded # Note: This is a helpful reference for identifying the toolchain # http://sourceforge.net/apps/mediawiki/predef/index.php?title=Compilers switch -glob -- [get-define host] { *-*-darwin* { define SHOBJ_CFLAGS "-dynamic -fno-common" define SHOBJ_LDFLAGS "-bundle -undefined dynamic_lookup" define SHOBJ_LDFLAGS_R -bundle define SH_CFLAGS -dynamic define SH_LDFLAGS -dynamiclib define SH_LINKFLAGS "" define SH_SOEXT .dylib define SH_SOEXTVER .%s.dylib define SH_SOPREFIX -Wl,-install_name, define SH_SOFULLPATH define LD_LIBRARY_PATH DYLD_LIBRARY_PATH define STRIPLIBFLAGS -x } *-*-ming* - *-*-cygwin - *-*-msys { define SHOBJ_CFLAGS "" define SHOBJ_LDFLAGS -shared define SH_CFLAGS "" define SH_LDFLAGS -shared define SH_LINKRPATH "" define SH_LINKFLAGS "" define SH_SOEXT .dll define SH_SOEXTVER .dll define SH_SOPREFIX "" define LD_LIBRARY_PATH PATH } sparc* { if {[msg-quiet cc-check-decls __SUNPRO_C]} { msg-result "Found sun stdio compiler" # sun stdio compiler # XXX: These haven't been fully tested. define SHOBJ_CFLAGS -KPIC define SHOBJ_LDFLAGS "-G" define SH_CFLAGS -KPIC define SH_LINKFLAGS -Wl,-export-dynamic define SH_SOPREFIX -Wl,-h, } } *-*-solaris* { if {[msg-quiet cc-check-decls __SUNPRO_C]} { msg-result "Found sun stdio compiler" # sun stdio compiler # XXX: These haven't been fully tested. define SHOBJ_CFLAGS -KPIC define SHOBJ_LDFLAGS "-G" define SH_CFLAGS -KPIC define SH_LINKFLAGS -Wl,-export-dynamic define SH_SOPREFIX -Wl,-h, } } |
︙ | ︙ | |||
101 102 103 104 105 106 107 | define SHOBJ_LDFLAGS -shared define SH_CFLAGS "" define SH_LDFLAGS -shared define SH_LINKFLAGS "" define SH_SOPREFIX "" define LD_LIBRARY_PATH LIBRARY_PATH } | < < < < < | 102 103 104 105 106 107 108 109 110 111 112 113 | define SHOBJ_LDFLAGS -shared define SH_CFLAGS "" define SH_LDFLAGS -shared define SH_LINKFLAGS "" define SH_SOPREFIX "" define LD_LIBRARY_PATH LIBRARY_PATH } } if {![is-defined SHOBJ_LDFLAGS_R]} { define SHOBJ_LDFLAGS_R [get-define SHOBJ_LDFLAGS] } |
Changes to autosetup/cc.tcl.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # @synopsis: # # The 'cc' module supports checking various 'features' of the C or C++ # compiler/linker environment. Common commands are 'cc-check-includes', # 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'. # # The following environment variables are used if set: # ## CC - C compiler ## CXX - C++ compiler ## CCACHE - Set to "none" to disable automatic use of ccache ## CFLAGS - Additional C compiler flags ## CXXFLAGS - Additional C++ compiler flags ## LDFLAGS - Additional compiler flags during linking ## LIBS - Additional libraries to use (for all tests) ## CROSS - Tool prefix for cross compilation # | > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 | # Copyright (c) 2010 WorkWare Systems http://www.workware.net.au/ # All rights reserved # @synopsis: # # The 'cc' module supports checking various 'features' of the C or C++ # compiler/linker environment. Common commands are 'cc-check-includes', # 'cc-check-types', 'cc-check-functions', 'cc-with', 'make-config-header' and 'make-template'. # # The following environment variables are used if set: # ## CC - C compiler ## CXX - C++ compiler ## CPP - C preprocessor ## CCACHE - Set to "none" to disable automatic use of ccache ## CFLAGS - Additional C compiler flags ## CXXFLAGS - Additional C++ compiler flags ## LDFLAGS - Additional compiler flags during linking ## LIBS - Additional libraries to use (for all tests) ## CROSS - Tool prefix for cross compilation # |
︙ | ︙ | |||
209 210 211 212 213 214 215 | # In addition, '-l$lib' is prepended to the 'LIBS' define. # # If additional libraries may be needed for linking, they should be specified # with '$extralibs' as '-lotherlib1 -lotherlib2'. # These libraries are not automatically added to 'LIBS'. # # Returns 1 if found or 0 if not. | | | 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 | # In addition, '-l$lib' is prepended to the 'LIBS' define. # # If additional libraries may be needed for linking, they should be specified # with '$extralibs' as '-lotherlib1 -lotherlib2'. # These libraries are not automatically added to 'LIBS'. # # Returns 1 if found or 0 if not. # proc cc-check-function-in-lib {function libs {otherlibs {}}} { msg-checking "Checking libs for $function..." set found 0 cc-with [list -libs $otherlibs] { if {[cctest_function $function]} { msg-result "none needed" define lib_$function "" |
︙ | ︙ | |||
430 431 432 433 434 435 436 | return -code [dict get $info -code] $result } return $result } } # @cctest ?settings? | | | 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 | return -code [dict get $info -code] $result } return $result } } # @cctest ?settings? # # Low level C/C++ compiler checker. Compiles and or links a small C program # according to the arguments and returns 1 if OK, or 0 if not. # # Supported settings are: # ## -cflags cflags A list of flags to pass to the compiler ## -includes list A list of includes, e.g. {stdlib.h stdio.h} |
︙ | ︙ | |||
461 462 463 464 465 466 467 | ## code /* any code in -code, verbatim */ ## return 0; ## } # # Any failures are recorded in 'config.log' # proc cctest {args} { | < | 462 463 464 465 466 467 468 469 470 471 472 473 474 475 | ## code /* any code in -code, verbatim */ ## return 0; ## } # # Any failures are recorded in 'config.log' # proc cctest {args} { set tmp conftest__ # Easiest way to merge in the settings cc-with $args { array set opts [cc-get-settings] } |
︙ | ︙ | |||
503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 | } # Build the command line set cmdline {} lappend cmdline {*}[get-define CCACHE] switch -exact -- $opts(-lang) { c++ { lappend cmdline {*}[get-define CXX] {*}[get-define CXXFLAGS] } c { lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] } default { autosetup-error "cctest called with unknown language: $opts(-lang)" } } | > > | 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 | } # Build the command line set cmdline {} lappend cmdline {*}[get-define CCACHE] switch -exact -- $opts(-lang) { c++ { set src conftest__.cpp lappend cmdline {*}[get-define CXX] {*}[get-define CXXFLAGS] } c { set src conftest__.c lappend cmdline {*}[get-define CC] {*}[get-define CFLAGS] } default { autosetup-error "cctest called with unknown language: $opts(-lang)" } } |
︙ | ︙ | |||
692 693 694 695 696 697 698 699 700 701 702 703 704 705 | define CC_FOR_BUILD [find-an-executable [get-env CC_FOR_BUILD ""] cc gcc false] if {[get-define CC] eq ""} { user-error "Could not find a C compiler. Tried: [join $try ", "]" } define CCACHE [find-an-executable [get-env CCACHE ccache]] # Initial cctest settings cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0} set autosetup(cc-include-deps) {} msg-result "C compiler...[get-define CCACHE] [get-define CC] [get-define CFLAGS]" if {[get-define CXX] ne "false"} { | > > > > > > > > > | 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 | define CC_FOR_BUILD [find-an-executable [get-env CC_FOR_BUILD ""] cc gcc false] if {[get-define CC] eq ""} { user-error "Could not find a C compiler. Tried: [join $try ", "]" } define CCACHE [find-an-executable [get-env CCACHE ccache]] # If any of these are set in the environment, propagate them to the AUTOREMAKE commandline foreach i {CC CXX CCACHE CPP CFLAGS CXXFLAGS CXXFLAGS LDFLAGS LIBS CROSS CPPFLAGS LINKFLAGS CC_FOR_BUILD LD} { if {[env-is-set $i]} { # Note: If the variable is set on the command line, get-env will return that value # so the command line will continue to override the environment define-append AUTOREMAKE [quote-if-needed $i=[get-env $i ""]] } } # Initial cctest settings cc-store-settings {-cflags {} -includes {} -declare {} -link 0 -lang c -libs {} -code {} -nooutput 0} set autosetup(cc-include-deps) {} msg-result "C compiler...[get-define CCACHE] [get-define CC] [get-define CFLAGS]" if {[get-define CXX] ne "false"} { |
︙ | ︙ |
Changes to autosetup/system.tcl.
︙ | ︙ | |||
44 45 46 47 48 49 50 51 52 53 54 55 56 57 | infodir: libexecdir: datadir: libdir: sysconfdir: sharedstatedir: localstatedir: maintainer-mode=0 dependency-tracking=0 silent-rules=0 }] # @check-feature name { script } # | > | 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 | infodir: libexecdir: datadir: libdir: sysconfdir: sharedstatedir: localstatedir: runstatedir: maintainer-mode=0 dependency-tracking=0 silent-rules=0 }] # @check-feature name { script } # |
︙ | ︙ | |||
127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 | if {$old eq $buf && [file exists $file]} { msg-result "$file is unchanged" } else { writefile $file $buf\n uplevel 1 $script } } # @make-template template ?outfile? # # Reads the input file '<srcdir>/$template' and writes the output file '$outfile' # (unless unchanged). # If '$outfile' is blank/omitted, '$template' should end with '.in' which # is removed to create the output file name. # # Each pattern of the form '@define@' is replaced with the corresponding # "define", if it exists, or left unchanged if not. | > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > > | | | > > | | < > > | | 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 | if {$old eq $buf && [file exists $file]} { msg-result "$file is unchanged" } else { writefile $file $buf\n uplevel 1 $script } } # @include-file infile mapping # # The core of make-template, called recursively for each @include # directive found within that template so that this proc's result # is the fully-expanded template. # # The mapping parameter is how we expand @varname@ within the template. # We do that inline within this step only for @include directives which # can have variables in the filename arg. A separate substitution pass # happens when this recursive function returns, expanding the rest of # the variables. # proc include-file {infile mapping} { # A stack of true/false conditions, one for each nested conditional # starting with "true" set condstack {1} set result {} set linenum 0 foreach line [split [readfile $infile] \n] { incr linenum if {[regexp {^@(if|else|endif)(\s*)(.*)} $line -> condtype condspace condargs]} { if {$condtype eq "if"} { if {[string length $condspace] == 0} { autosetup-error "$infile:$linenum: Invalid expression: $line" } if {[llength $condargs] == 1} { # ABC => [get-define ABC] ni {0 ""} # !ABC => [get-define ABC] in {0 ""} lassign $condargs condvar if {[regexp {^!(.*)} $condvar -> condvar]} { set op in } else { set op ni } set condexpr "\[[list get-define $condvar]\] $op {0 {}}" } else { # Translate alphanumeric ABC into [get-define ABC] and leave the # rest of the expression untouched regsub -all {([A-Z][[:alnum:]_]*)} $condargs {[get-define \1]} condexpr } if {[catch [list expr $condexpr] condval]} { dputs $condval autosetup-error "$infile:$linenum: Invalid expression: $line" } dputs "@$condtype: $condexpr => $condval" } if {$condtype ne "if"} { if {[llength $condstack] <= 1} { autosetup-error "$infile:$linenum: Error: @$condtype missing @if" } elseif {[string length $condargs]} { autosetup-error "$infile:$linenum: Error: Extra arguments after @$condtype" } } switch -exact $condtype { if { # push condval lappend condstack $condval } else { # Toggle the last entry set condval [lpop condstack] set condval [expr {!$condval}] lappend condstack $condval } endif { if {[llength $condstack] == 0} { user-notice "$infile:$linenum: Error: @endif missing @if" } lpop condstack } } continue } elseif {[regexp {^@include\s+(.*)} $line -> filearg]} { set incfile [string map $mapping $filearg] if {[file exists $incfile]} { lappend ::autosetup(deps) [file-normalize $incfile] lappend result {*}[include-file $incfile $mapping] } else { user-error "$infile:$linenum: Include file $incfile is missing" } continue } elseif {[regexp {^@define\s+(\w+)\s+(.*)} $line -> var val]} { define $var $val continue } # Only output this line if the stack contains all "true" if {"0" in $condstack} { continue } lappend result $line } return $result } # @make-template template ?outfile? # # Reads the input file '<srcdir>/$template' and writes the output file '$outfile' # (unless unchanged). # If '$outfile' is blank/omitted, '$template' should end with '.in' which # is removed to create the output file name. # # Each pattern of the form '@define@' is replaced with the corresponding # "define", if it exists, or left unchanged if not. # # The special value '@srcdir@' is substituted with the relative # path to the source directory from the directory where the output # file is created, while the special value '@top_srcdir@' is substituted # with the relative path to the top level source directory. # # Conditional sections may be specified as follows: ## @if NAME eq "value" ## lines ## @else ## lines ## @endif # # Where 'NAME' is a defined variable name and '@else' is optional. # Note that variables names *must* start with an uppercase letter. # If the expression does not match, all lines through '@endif' are ignored. # # The alternative forms may also be used: ## @if NAME (true if the variable is defined, but not empty and not "0") ## @if !NAME (opposite of the form above) ## @if <general-tcl-expression> # # In the general Tcl expression, any words beginning with an uppercase letter # are translated into [get-define NAME] # # Expressions may be nested # proc make-template {template {out {}}} { set infile [file join $::autosetup(srcdir) $template] if {![file exists $infile]} { user-error "Template $template is missing" } |
︙ | ︙ | |||
187 188 189 190 191 192 193 | # Make sure the directory exists file mkdir $outdir # Set up srcdir and top_srcdir to be relative to the target dir define srcdir [relative-path [file join $::autosetup(srcdir) $outdir] $outdir] define top_srcdir [relative-path $::autosetup(srcdir) $outdir] | > > > | | | | < < < < < < | | < | < | < | | < < > > | < | < < < < < < < < < < < < | 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 | # Make sure the directory exists file mkdir $outdir # Set up srcdir and top_srcdir to be relative to the target dir define srcdir [relative-path [file join $::autosetup(srcdir) $outdir] $outdir] define top_srcdir [relative-path $::autosetup(srcdir) $outdir] # Build map from global defines to their values so they can be # substituted into @include file names. proc build-define-mapping {} { set mapping {} foreach {n v} [array get ::define] { lappend mapping @$n@ $v } return $mapping } set mapping [build-define-mapping] set result [include-file $infile $mapping] # Rebuild the define mapping in case we ran across @define # directives in the template or a file it @included, then # apply that mapping to the expanded template. set mapping [build-define-mapping] write-if-changed $out [string map $mapping [join $result \n]] { msg-result "Created [relative-path $out] from [relative-path $template]" } } # build/host tuples and cross-compilation prefix opt-str build build "" |
︙ | ︙ | |||
297 298 299 300 301 302 303 304 305 306 307 308 309 310 | opt-str sysconfdir sysconfdir $prefix/etc } else { opt-str sysconfdir sysconfdir /etc } define sysconfdir $sysconfdir define localstatedir [opt-str localstatedir o /var] define SHELL [get-env SHELL [find-an-executable sh bash ksh]] # These could be used to generate Makefiles following some automake conventions define AM_SILENT_RULES [opt-bool silent-rules] define AM_MAINTAINER_MODE [opt-bool maintainer-mode] define AM_DEPENDENCY_TRACKING [opt-bool dependency-tracking] | > | 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 | opt-str sysconfdir sysconfdir $prefix/etc } else { opt-str sysconfdir sysconfdir /etc } define sysconfdir $sysconfdir define localstatedir [opt-str localstatedir o /var] define runstatedir [opt-str runstatedir o /run] define SHELL [get-env SHELL [find-an-executable sh bash ksh]] # These could be used to generate Makefiles following some automake conventions define AM_SILENT_RULES [opt-bool silent-rules] define AM_MAINTAINER_MODE [opt-bool maintainer-mode] define AM_DEPENDENCY_TRACKING [opt-bool dependency-tracking] |
︙ | ︙ |
Changes to bin/pidp8i.in.
1 2 3 4 5 | #!/bin/bash ######################################################################## # pidp8i.in - Collection of scriptlets for dealing with the pidp8i # systemd user service and its associated screen(1) session. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 | #!/bin/bash ######################################################################## # pidp8i.in - Collection of scriptlets for dealing with the pidp8i # systemd user service and its associated screen(1) session. # # Copyright © 2015-2019 Oscar Vermeulen and Warren Young # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to |
︙ | ︙ | |||
30 31 32 33 34 35 36 37 38 | # authorization from those authors. ######################################################################## bootdir="@BOOTDIR@" prefix="@ABSPREFIX@" sim="$prefix/bin/pidp8i-sim" scanswitch="$prefix/libexec/scanswitch" is_running() { | > > | | > > > > | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 | # authorization from those authors. ######################################################################## bootdir="@BOOTDIR@" prefix="@ABSPREFIX@" sim="$prefix/bin/pidp8i-sim" scanswitch="$prefix/libexec/scanswitch" systemctl=/bin/systemctl ggrep=$(which ggrep grep | head -1) is_running() { procs=`screen -list pidp8i | $ggrep -Pc '\d\.pidp8i'` test -n "$procs" && test $procs -gt 0 && return 0 || return 1 } sim_child_pid() { screen -ls pidp8i | grep -Eo '[[:digit:]]+\.pidp8i' | grep -Eo '^[[:digit:]]+' } # Were we given a command line argument? if [ -z "$1" ] then # No, so just try to attach to the running simulator if is_running |
︙ | ︙ | |||
71 72 73 74 75 76 77 | # the Makefile, which must be done as @INSTUSR@. set -e cd @abs_top_builddir@ export XDG_RUNTIME_DIR=/run/user/$(id -u) unitdir=~@INSTUSR@/.local/share/systemd/user @INSTALL@ -d $unitdir @INSTALL@ -m 644 @srcdir@/etc/pidp8i.service $unitdir | | | | | | 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | # the Makefile, which must be done as @INSTUSR@. set -e cd @abs_top_builddir@ export XDG_RUNTIME_DIR=/run/user/$(id -u) unitdir=~@INSTUSR@/.local/share/systemd/user @INSTALL@ -d $unitdir @INSTALL@ -m 644 @srcdir@/etc/pidp8i.service $unitdir $systemctl --user daemon-reload $systemctl --user enable pidp8i elif test -t 1 -a -x $systemctl then # We were given some other arg(s) and we're attached to a terminal, # so build a systemctl command with those args so the user doesn't # have to type out the canonical form of the command. $systemctl --user $verb "$@" pidp8i exit $? elif [ "$verb" = "start" ] then # systemd is telling us to start the background simulator if is_running then echo "PiDP-8/I is already running, not starting again." >&2 |
︙ | ︙ | |||
113 114 115 116 117 118 119 | fi # We want SIMH to have a sensible working directory: somewhere the # user can write files and which makes sense when giving SIMH # commands involving file paths. This default is chosen because it # satisfies both criteria. # If you change the default here, change that script as well. | | | > | > > | | < > | > | < | > > | < > | < < < | | | | < < < < | < < < < < | | < < < < < | | 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 | fi # We want SIMH to have a sensible working directory: somewhere the # user can write files and which makes sense when giving SIMH # commands involving file paths. This default is chosen because it # satisfies both criteria. # If you change the default here, change that script as well. cd "$prefix/share/media" && screen -dm -S pidp8i "$sim" "$bscript" && systemd-notify --ready --pid=$(sim_child_pid) && exit 0 exit 1 elif [ "$verb" = "stop" ] then # Someone (maybe the user via "pidp8i stop", maybe systemd via # "systemctl pidp8i stop") is telling us to stop the background # simulator. # # First figure out what the simulator is called and send it the # signal that shuts it down gracefully. for sim in pdp8 pidp8i-sim do if pkill -0 $sim then # Give it the signal to start shutting down gracefully: stop # GPIO thread, save simulator state if savestate enabled... # Give it time to complete, then kill it hard in case it # doesn't die on its own. echo -n "Stopping $sim simulator..." for sig in TERM KILL ; do pkill -$sig $sim ; sleep 1 ; done # screen(1) might still be running despite its only child # dying. Nuke it hard if so. if is_running ; then screen -S pidp8i -X quit ; fi exit 0 fi done exit 1 fi |
Changes to bin/teco-pi-demo.
︙ | ︙ | |||
70 71 72 73 74 75 76 77 78 79 80 81 82 83 | s.send_cmd ("att rk0 " + rk) s.send_cmd ("boot rk0") # Start TECO8 in the simulator under OS/8 s.os8_send_cmd ('\\.', "R TECO") # The macro comes from http://www.iwriteiam.nl/HaPi_TECO_macro.html # # The 248 preceding "UN" in the first line of the macro is the number # of digits of pi to calculate. That value was reached by experiment # as the largest value that runs without crashing TECO with a # # ?MEM STORAGE CAPACITY EXCEEDED # | > | 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 | s.send_cmd ("att rk0 " + rk) s.send_cmd ("boot rk0") # Start TECO8 in the simulator under OS/8 s.os8_send_cmd ('\\.', "R TECO") # The macro comes from http://www.iwriteiam.nl/HaPi_TECO_macro.html # and it was created by Stanley Rabinowitz. # # The 248 preceding "UN" in the first line of the macro is the number # of digits of pi to calculate. That value was reached by experiment # as the largest value that runs without crashing TECO with a # # ?MEM STORAGE CAPACITY EXCEEDED # |
︙ | ︙ |
Changes to boot/0.script.in.
︙ | ︙ | |||
17 18 19 20 21 22 23 | ; IF != 0 -- you can set IF = 7 and toggle the Sing_Step switch on ; and back off, which restarts the simulator with 7.script, which in ; turn loads this one. This somewhat clumsy arrangement is required ; because toggling Sing_Step with IF = 0 must not be made to restart ; the simulator, else there would be no way to use Sing_Step for any ; of its other functions. See the PiDP-8/I instructions for details. ; | < < < < < | < < < | < | < < < < < < < < < > > | 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 | ; IF != 0 -- you can set IF = 7 and toggle the Sing_Step switch on ; and back off, which restarts the simulator with 7.script, which in ; turn loads this one. This somewhat clumsy arrangement is required ; because toggling Sing_Step with IF = 0 must not be made to restart ; the simulator, else there would be no way to use Sing_Step for any ; of its other functions. See the PiDP-8/I instructions for details. ; echo Loading OS/8 from the RK05 cartridge disk... @include @srcdir@/boot/common.script @define SHORTNAME 0 @include @srcdir@/boot/savestate.script att rk0 @MEDIADIR@/os8/@OS8_BOOT_DISK@ boot rk0 :end |
Changes to boot/2.script.in.
1 2 3 4 5 | ; This script initializes a populated TSS/8 environment on an ; RS08 fixed-head hard disk drive (384 kB!) controlled by the ; RF08 disk controller. ; echo Loading TSS/8 from the RS08 fixed-head disk... | > | | < | > | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 | ; This script initializes a populated TSS/8 environment on an ; RS08 fixed-head hard disk drive (384 kB!) controlled by the ; RF08 disk controller. ; echo Loading TSS/8 from the RS08 fixed-head disk... @include @srcdir@/boot/common.script set rf enabled @define SHORTNAME 2 @include @srcdir@/boot/savestate.script load @MEDIADIR@/tss8/tss8_init.bin attach rf @MEDIADIR@/tss8/tss8_rf.dsk attach ttix 4000 run 24200 :end |
Changes to boot/3.script.in.
1 2 3 4 | ; Loads OS/8 from DECtape, as opposed to the RK05 based environment ; in 0.script. ; echo Loading OS/8 from DECtape type @OS8_TAPE_DEVICE@... | | < < < | | < | < < < < < < < < < > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 | ; Loads OS/8 from DECtape, as opposed to the RK05 based environment ; in 0.script. ; echo Loading OS/8 from DECtape type @OS8_TAPE_DEVICE@... @include @srcdir@/boot/common.script @if SIMH_TAPE_DEVICE eq "td" set dt disabled set td enabled ; else, default is correct, per p.4 in SIMH's pdp8_doc.doc. @endif @define SHORTNAME 3 @include @srcdir@/boot/savestate.script attach @SIMH_TAPE_DEVICE@0 @MEDIADIR@/os8/@OS8_BOOT_TAPE@ boot @SIMH_TAPE_DEVICE@0 :end |
Changes to boot/4.script.in.
︙ | ︙ | |||
13 14 15 16 17 18 19 | echo echo Press both rotate keys simulatenously to warp into hyperspace. echo echo Press Ctrl-E to pause the simulator and return to the SimH echo command prompt, where you can say "quit", "help" and other echo things. See the SimH manual for details. echo | | | < < < > > > > > > | 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 | echo echo Press both rotate keys simulatenously to warp into hyperspace. echo echo Press Ctrl-E to pause the simulator and return to the SimH echo command prompt, where you can say "quit", "help" and other echo things. See the SimH manual for details. echo @include @srcdir@/boot/common.script at ttix 2222 set ttox0 8b @define SHORTNAME 4 @include @srcdir@/boot/savestate.script load @MEDIADIR@/spacewar/spacewar.bin g 200 :end |
Changes to boot/6.script.in.
1 2 3 | ; This script loads ETOS V5B from the RK05 cartridge disk drive. ; echo Loading ETOS from the RK05 cartridge disk drive... | | | < < < < > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | ; This script loads ETOS V5B from the RK05 cartridge disk drive. ; echo Loading ETOS from the RK05 cartridge disk drive... @include @srcdir@/boot/common.script set tsc enabled attach ttix 4000 @define SHORTNAME 6 @include @srcdir@/boot/savestate.script att rk0 @MEDIADIR@/etos/etosv5b-demo.rk05 boot -d rk0 :end |
Added boot/common.script.in.
> > > > > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | ; The IF + SING_STEP toggle feature allows switching among boot scripts, ; so reset simulator in case we're switching from one script to another. reset ; Standard PDP-8 config for all scripts. set cpu 32k set cpu noidle set df disabled ; Standard CPU throttling behavior. See README-throttle.md. deposit int-throttle THROT_DELAY 3 @SET_THROTTLE@ @if SIMH_PASS_LOWERCASE ; The software was configured with either --lowercase=auto or =pass, ; so send all text input to the simulator as 7-bit ASCII, including ; lowercase. Lowercase output from the simulator will be sent to the ; console unchanged, as will non-printing chars. set tti 7b @else ; The software was configured with --lowercase=upper, meaning the user ; wants lowercase text to be forced to uppercase. This is bidirectional, ; affecting both input to the simulated PDP-8 and output from it. set tti ksr @endif ; Common shutdown behavior set on on SIGTERM exit |
Changes to boot/run-v3f.script.in.
1 2 3 4 5 6 7 8 | ; Loads OS/8 V3F from DECtape, as opposed to the RK05 based environment ; in 0.script. Based on 3.script.in, which differs by being conditional ; based on whether the user chooses at configure time whether to boot ; OS/8 V3F or V3D. This script also runs the tape image from the build ; directory, rather than from the installation directory, since it's ; normally run as "make run-v3f". ; echo Loading OS/8 from DECtape type @OS8_TAPE_DEVICE@... | | < < < | | < | < < < < < < < < < > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ; Loads OS/8 V3F from DECtape, as opposed to the RK05 based environment ; in 0.script. Based on 3.script.in, which differs by being conditional ; based on whether the user chooses at configure time whether to boot ; OS/8 V3F or V3D. This script also runs the tape image from the build ; directory, rather than from the installation directory, since it's ; normally run as "make run-v3f". ; echo Loading OS/8 from DECtape type @OS8_TAPE_DEVICE@... @include @srcdir@/boot/common.script @if SIMH_TAPE_DEVICE eq "td" set dt disabled set td enabled ; else, default is correct, per p.4 in SIMH's pdp8_doc.doc. @endif @define SHORTNAME run-v3f @include @srcdir@/boot/savestate.script attach @SIMH_TAPE_DEVICE@0 bin/v3f-@OS8_TAPE_DEVICE@.tu56 boot @SIMH_TAPE_DEVICE@0 :end |
Changes to boot/run.script.in.
1 2 3 4 | ; Same as 0.script, only with RK0 attached to the *.rk05 file in the ; build directory, not the one in the installation directory. Used ; by "make run" so you don't have to "make mediainstall" first. ; | < < < < < < > < < < < < > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | ; Same as 0.script, only with RK0 attached to the *.rk05 file in the ; build directory, not the one in the installation directory. Used ; by "make run" so you don't have to "make mediainstall" first. ; echo Loading OS/8 from the RK05 cartridge disk in the build directory... @include @srcdir@/boot/common.script @define SHORTNAME run @include @srcdir@/boot/savestate.script att rk0 bin/@OS8_BOOT_DISK@ boot rk0 :end |
Added boot/savestate.script.
> > > > > > > > > > > > > > > > > > > > > > > > > > | 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 | @if SAVESTATE #### BEGIN savestate.script ############################################ # Common elements for saving PDP-8 CPU and core states to disk, included # into all generated *.script files. Based on a post by Mark Pizzolato: # # https://github.com/simh/simh/issues/681#issuecomment-483735676 # # with modifications by Warren Young. SET ENV statefile=%HOME%/.pidp8i-@SHORTNAME@.state ON SIGTERM SAVE %statefile% ; EXIT IF NOT EXIST %statefile% GOTO boot :restore RESTORE %statefile% DELETE %statefile% CONTINUE GOTO end :boot #### END savestate.script ############################################## @endif |
Changes to boot/tss8.script.in.
1 2 3 4 5 6 7 8 | ; Same as 2.script, except that the binary disk image and core init ; image files are copied into the build tree's bin/ directory and run ; from there rather than being run from the installation tree. ; ; This is used by "make run-tss8" so you don't have to say ; "make mediainstall" then manually start the simulator with 2.script. ; echo Loading TSS/8 from the RS08 fixed-head disk... | | | | | | > | | > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 | ; Same as 2.script, except that the binary disk image and core init ; image files are copied into the build tree's bin/ directory and run ; from there rather than being run from the installation tree. ; ; This is used by "make run-tss8" so you don't have to say ; "make mediainstall" then manually start the simulator with 2.script. ; echo Loading TSS/8 from the RS08 fixed-head disk... @include @srcdir@/boot/common.script set rf enabled !cp -n media/tss8/tss8_rf.dsk bin @define SHORTNAME tss8 @include @srcdir@/boot/savestate.script !cp media/tss8/tss8_init.bin bin load bin/tss8_init.bin attach rf bin/tss8_rf.dsk attach ttix 4000 run 24200 :end |
Changes to configure.
1 2 | #!/bin/sh dir="`dirname "$0"`/autosetup" | | | 1 2 3 | #!/bin/sh dir="`dirname "$0"`/autosetup" WRAPPER="$0"; export WRAPPER; exec "`"$dir/autosetup-find-tclsh"`" "$dir/autosetup" "$@" |
Changes to doc/RELEASE-PROCESS.md.
︙ | ︙ | |||
64 65 66 67 68 69 70 | `wget` link in `tools/bosi` is probably stale. Build an updated binary, run `tools/publish-fossil`, then replace the file name part of the URL in `tools/bosi` to pull that new version. ## Update the Release Branch | | | | | 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 | `wget` link in `tools/bosi` is probably stale. Build an updated binary, run `tools/publish-fossil`, then replace the file name part of the URL in `tools/bosi` to pull that new version. ## Update the Release Branch Run `make release` to check the `ChangeLog.md` file changes in, merge trunk to the `release` branch, and apply a tag of the form vYYYYMMDD to that marge checkin. It runs entirely automatically unless an error occurs, in which case it stops immediately, so check its output for errors before continuing. ## Update the Home Page Links |
︙ | ︙ |
Changes to doc/class-simh.md.
︙ | ︙ | |||
72 73 74 75 76 77 78 | If you don't want the PiDP-8/I GPIO thread to run while your script runs, pass True here instead, since this is the "skip GPIO" flag, and its default is therefore False. We do that from programs like `os8-run` and `os8-cp` because we want them to run everywhere, even on an RPi while another simulator is running; we also don't want the front panel switches to affect these programs' operations. If your program | | | | | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 | If you don't want the PiDP-8/I GPIO thread to run while your script runs, pass True here instead, since this is the "skip GPIO" flag, and its default is therefore False. We do that from programs like `os8-run` and `os8-cp` because we want them to run everywhere, even on an RPi while another simulator is running; we also don't want the front panel switches to affect these programs' operations. If your program never runs on an RPi, passing True here will usuall make it run faster, since the GPIO thread saps computer resources and so shouldn’t be started if it isn’t needed. ## Logging The next step is to tell the `s` object where to send its logging output: |
︙ | ︙ | |||
125 126 127 128 129 130 131 | This shows one of the most-used methods, `simh.send_cmd`, which sends a line of text along with a carriage return to the spawned child program, which again is `pidp8i-sim`. ## Driving SIMH and OS/8 | | | 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 | This shows one of the most-used methods, `simh.send_cmd`, which sends a line of text along with a carriage return to the spawned child program, which again is `pidp8i-sim`. ## Driving SIMH and OS/8 After the simulator starts up, we want to wait for an OS/8 “`.`” prompt and then send the first OS/8 command to start our demo. We use the `simh.os8_send_cmd` method for that: s.os8_send_cmd ('\\.', "R TECO") This method differs from `send_cmd` in a couple of key ways. |
︙ | ︙ | |||
149 150 151 152 153 154 155 | (See the commentary for `simh._kbd_delay` if you want to know how that delay value was calculated.) The bulk of `teco-pi-demo` consists of more calls to `simh.os8_send_cmd` and `simh.send_cmd`. Read the script if you want more examples. | | | 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 | (See the commentary for `simh._kbd_delay` if you want to know how that delay value was calculated.) The bulk of `teco-pi-demo` consists of more calls to `simh.os8_send_cmd` and `simh.send_cmd`. Read the script if you want more examples. **IMPORTANT:** The “`\\.`” syntax for specifying the OS/8 `.` command prompt is tricky. If you pass just `'.'` here instead, Python's [regular expression][re] matching engine will interpret it to mean that it should match *any* character as the prompt, almost certainly breaking your script's state machine, since it is likely to cause the call to return too early. If you instead pass `'\.'`, Python's string parser will take the backslash as escaping the period and again pass just a single period character to the regex engine, giving the same |
︙ | ︙ | |||
219 220 221 222 223 224 225 | You can usually avoid the need for that delay by waiting for an OS/8 command prompt before escaping to SIMH, since that is a reliable indicator that OS/8 is in such an interruptible state. You don't see these anomalies when using OS/8 interactively because humans aren't fast enough to type commands at OS/8 fast enough to cause | | | 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 | You can usually avoid the need for that delay by waiting for an OS/8 command prompt before escaping to SIMH, since that is a reliable indicator that OS/8 is in such an interruptible state. You don't see these anomalies when using OS/8 interactively because humans aren't fast enough to type commands at OS/8 fast enough to cause the problem. That is doubtless why this bug still exists in OS/8 in 2017. ### Re-Entering If your use of OS/8 is such that all required state is saved to disk before re-entering OS/8, you can call the `simh.os8_restart` method to |
︙ | ︙ | |||
272 273 274 275 276 277 278 | [ssc]: https://tangentsoft.com/pidp8i/file/lib/simh.py [dsc]: https://tangentsoft.com/pidp8i/file/lib/pidp8i/dirs.py ## <a id="license" name="credits"></a>Credits and License | | | 272 273 274 275 276 277 278 279 280 281 282 | [ssc]: https://tangentsoft.com/pidp8i/file/lib/simh.py [dsc]: https://tangentsoft.com/pidp8i/file/lib/pidp8i/dirs.py ## <a id="license" name="credits"></a>Credits and License Written by and copyright © 2017-2019 by Warren Young. Licensed under the terms of [the SIMH license][sl]. [sl]: https://tangentsoft.com/pidp8i/doc/trunk/SIMH-LICENSE.md |
Changes to etc/pidp8i.service.in.
1 2 3 | ######################################################################## # pidp8i.service - systemd user unit file for the PiDP-8/I service. # | | | 1 2 3 4 5 6 7 8 9 10 11 | ######################################################################## # pidp8i.service - systemd user unit file for the PiDP-8/I service. # # Copyright © 2018-2019 Warren Young # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to |
︙ | ︙ | |||
29 30 31 32 33 34 35 | ######################################################################## [Unit] Description=PiDP-8/I Simulator Documentation=https://tangentsoft.com/pidp8i/doc/trunk/README.md#unit [Service] | | < < > > | 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 | ######################################################################## [Unit] Description=PiDP-8/I Simulator Documentation=https://tangentsoft.com/pidp8i/doc/trunk/README.md#unit [Service] Type=notify ExecStart=@ABSPREFIX@/bin/pidp8i start ExecStop=@ABSPREFIX@/bin/pidp8i stop WorkingDirectory=@ABSPREFIX@/share/media NotifyAccess=all KillMode=none [Install] WantedBy=default.target |
Changes to src/SIMH/scp.c.
︙ | ︙ | |||
630 631 632 633 634 635 636 637 638 639 640 641 642 643 | char *sim_sub_instr_buf = NULL; /* Buffer address that substitutions were saved in */ size_t sim_sub_instr_size = 0; /* substitution buffer size */ size_t *sim_sub_instr_off = NULL; /* offsets in substitution buffer where original data started */ static double sim_time; static uint32 sim_rtime; static int32 noqueue_time; volatile t_bool stop_cpu = FALSE; static unsigned int sim_stop_sleep_ms = 250; static char **sim_argv; static int sim_exit_status = EXIT_SUCCESS; /* optionally set by EXIT command */ t_value *sim_eval = NULL; static t_value sim_last_val; static t_addr sim_last_addr; FILE *sim_log = NULL; /* log file */ | > | 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 | char *sim_sub_instr_buf = NULL; /* Buffer address that substitutions were saved in */ size_t sim_sub_instr_size = 0; /* substitution buffer size */ size_t *sim_sub_instr_off = NULL; /* offsets in substitution buffer where original data started */ static double sim_time; static uint32 sim_rtime; static int32 noqueue_time; volatile t_bool stop_cpu = FALSE; volatile t_bool sigterm_received = FALSE; static unsigned int sim_stop_sleep_ms = 250; static char **sim_argv; static int sim_exit_status = EXIT_SUCCESS; /* optionally set by EXIT command */ t_value *sim_eval = NULL; static t_value sim_last_val; static t_addr sim_last_addr; FILE *sim_log = NULL; /* log file */ |
︙ | ︙ | |||
787 788 789 790 791 792 793 794 795 796 797 798 799 800 | {"STALL", "Console Telnet output stall"}, {"AFAIL", "Assertion failed"}, {"INVREM", "Invalid remote console command"}, {"EXPECT", "Expect matched"}, {"AMBREG", "Ambiguous register name"}, {"REMOTE", "remote console command"}, {"INVEXPR", "invalid expression"}, }; const size_t size_map[] = { sizeof (int8), sizeof (int8), sizeof (int16), sizeof (int32), sizeof (int32) #if defined (USE_INT64) , sizeof (t_int64), sizeof (t_int64), sizeof (t_int64), sizeof (t_int64) #endif | > | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | {"STALL", "Console Telnet output stall"}, {"AFAIL", "Assertion failed"}, {"INVREM", "Invalid remote console command"}, {"EXPECT", "Expect matched"}, {"AMBREG", "Ambiguous register name"}, {"REMOTE", "remote console command"}, {"INVEXPR", "invalid expression"}, {"SIGTERM", "SIGTERM received"}, }; const size_t size_map[] = { sizeof (int8), sizeof (int8), sizeof (int16), sizeof (int32), sizeof (int32) #if defined (USE_INT64) , sizeof (t_int64), sizeof (t_int64), sizeof (t_int64), sizeof (t_int64) #endif |
︙ | ︙ | |||
1841 1842 1843 1844 1845 1846 1847 | " than SCPE_STEP, SCPE_OK, and SCPE_EXIT.\n\n" " ON Traps can specify any of these status values:\n\n" "++NXM, UNATT, IOERR, CSUM, FMT, NOATT, OPENERR, MEM, ARG,\n" "++STEP, UNK, RO, INCOMP, STOP, TTIERR, TTOERR, EOF, REL,\n" "++NOPARAM, ALATT, TIMER, SIGERR, TTYERR, SUB, NOFNC, UDIS,\n" "++NORO, INVSW, MISVAL, 2FARG, 2MARG, NXDEV, NXUN, NXREG,\n" "++NXPAR, NEST, IERR, MTRLNT, LOST, TTMO, STALL, AFAIL,\n" | | > > > > > > > > > | 1843 1844 1845 1846 1847 1848 1849 1850 1851 1852 1853 1854 1855 1856 1857 1858 1859 1860 1861 1862 1863 1864 1865 1866 1867 1868 1869 1870 1871 1872 1873 1874 1875 1876 1877 1878 1879 1880 1881 1882 1883 1884 1885 | " than SCPE_STEP, SCPE_OK, and SCPE_EXIT.\n\n" " ON Traps can specify any of these status values:\n\n" "++NXM, UNATT, IOERR, CSUM, FMT, NOATT, OPENERR, MEM, ARG,\n" "++STEP, UNK, RO, INCOMP, STOP, TTIERR, TTOERR, EOF, REL,\n" "++NOPARAM, ALATT, TIMER, SIGERR, TTYERR, SUB, NOFNC, UDIS,\n" "++NORO, INVSW, MISVAL, 2FARG, 2MARG, NXDEV, NXUN, NXREG,\n" "++NXPAR, NEST, IERR, MTRLNT, LOST, TTMO, STALL, AFAIL,\n" "++AMBREG, SIGTERM\n\n" " These values can be indicated by name or by their internal\n" " numeric value (not recommended).\n" /***************** 80 character line width template *************************/ "3CONTROL-C Trapping\n" " A special ON trap is available to describe action(s) to be taken\n" " when CONTROL_C (aka SIGINT) occurs during the execution of\n" " simh commands and/or command procedures.\n\n" "++on CONTROL_C <action> perform action(s) after CTRL+C\n" "++on CONTROL_C restore default CTRL+C action\n\n" " The default ON CONTROL_C handler will exit nested DO command\n" " procedures and return to the sim> prompt.\n\n" " Note 1: When a simulator is executing instructions entering CTRL+C\n" "+will cause the CNTL+C character to be delivered to the simulator as\n" "+input. The simulator instruction execution can be stopped by entering\n" "+the WRU character (usually CTRL+E). Once instruction execution has\n" "+stopped, CTRL+C can be entered and potentially acted on by the\n" "+ON CONTROL_C trap handler.\n" " Note 2: The ON CONTROL_C trapping is not affected by the SET ON and\n" "+SET NOON commands.\n" "3SIGTERM Trapping\n" " A special ON trap is available to describe action(s) to be taken\n" " when a SIGTERM (or a Windows Shutdown) signal is delivered during\n" " simulator instruction execution. After a SIGTERM has been delivered\n" " to a simulator process, instruction execution will stop and control\n" " will return to either the invoking do command procedure with a SIGTERM\n" " status (and thus take SIGTERM ON condition) or if execution was\n" " explicitly started from a sim> prompt, the program will exit\n" #define HLP_PROCEED "*Commands Executing_Command_Files PROCEED" #define HLP_IGNORE "*Commands Executing_Command_Files PROCEED" /***************** 80 character line width template *************************/ "3PROCEED/IGNORE\n" " The PROCEED or IGNORE commands do nothing. They are potentially useful\n" " placeholders for an ON action condition which should be explicitly ignored\n" "++proceed continue command file execution without doing anything\n" |
︙ | ︙ | |||
2707 2708 2709 2710 2711 2712 2713 | t_stat stat_nomessage; CTAB *cmdp; stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ while (stat != SCPE_EXIT) { /* in case exit */ if (stop_cpu) { /* SIGINT happened? */ stop_cpu = FALSE; | | > | 2718 2719 2720 2721 2722 2723 2724 2725 2726 2727 2728 2729 2730 2731 2732 2733 | t_stat stat_nomessage; CTAB *cmdp; stat = SCPE_BARE_STATUS(stat); /* remove possible flag */ while (stat != SCPE_EXIT) { /* in case exit */ if (stop_cpu) { /* SIGINT happened? */ stop_cpu = FALSE; if ((!sim_ttisatty()) || sigterm_received) { stat = SCPE_EXIT; break; } if (sim_on_actions[sim_do_depth][ON_SIGINT_ACTION]) sim_brk_setact (sim_on_actions[sim_do_depth][ON_SIGINT_ACTION]); } #ifdef PIDP8I |
︙ | ︙ | |||
2870 2871 2872 2873 2874 2875 2876 2877 2878 2879 2880 2881 2882 2883 | } hlp_cmdp[cmd_cnt] = cmdp; ++cmd_cnt; if (strlen (cmdp->name) > max_cmdname_size) max_cmdname_size = strlen(cmdp->name); } } fprintf (st, "Help is available for the following commands:\n\n "); qsort (hlp_cmdp, cmd_cnt, sizeof(*hlp_cmdp), _cmd_name_compare); line_offset = 4; for (i=0; i<cmd_cnt; ++i) { fputs (hlp_cmdp[i]->name, st); line_offset += 5 + max_cmdname_size; if (line_offset + max_cmdname_size > 79) { | > > > > > | 2882 2883 2884 2885 2886 2887 2888 2889 2890 2891 2892 2893 2894 2895 2896 2897 2898 2899 2900 | } hlp_cmdp[cmd_cnt] = cmdp; ++cmd_cnt; if (strlen (cmdp->name) > max_cmdname_size) max_cmdname_size = strlen(cmdp->name); } } fprintf (st, "Help is available for devices\n\n"); fprintf (st, " HELP dev\n"); fprintf (st, " HELP dev SET\n"); fprintf (st, " HELP dev SHOW\n"); fprintf (st, " HELP dev REGISTERS\n\n"); fprintf (st, "Help is available for the following commands:\n\n "); qsort (hlp_cmdp, cmd_cnt, sizeof(*hlp_cmdp), _cmd_name_compare); line_offset = 4; for (i=0; i<cmd_cnt; ++i) { fputs (hlp_cmdp[i]->name, st); line_offset += 5 + max_cmdname_size; if (line_offset + max_cmdname_size > 79) { |
︙ | ︙ | |||
3269 3270 3271 3272 3273 3274 3275 3276 3277 3278 3279 3280 3281 | return SCPE_OK; } t_stat help_cmd (int32 flag, CONST char *cptr) { char gbuf[CBUFSIZE], gbuf2[CBUFSIZE]; CTAB *cmdp; GET_SWITCHES (cptr); /* get switches */ if (sim_switches & SWMASK ('F')) flag = flag | SCP_HELP_FLAT; if (*cptr) { cptr = get_glyph (cptr, gbuf, 0); | > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | < < < < < | < | < < < < < < < < | | < | 3286 3287 3288 3289 3290 3291 3292 3293 3294 3295 3296 3297 3298 3299 3300 3301 3302 3303 3304 3305 3306 3307 3308 3309 3310 3311 3312 3313 3314 3315 3316 3317 3318 3319 3320 3321 3322 3323 3324 3325 3326 3327 3328 3329 3330 3331 3332 3333 3334 3335 3336 3337 3338 3339 3340 3341 3342 3343 3344 3345 3346 3347 3348 3349 3350 3351 3352 3353 3354 3355 3356 3357 3358 3359 3360 3361 3362 3363 3364 3365 3366 3367 3368 3369 3370 3371 3372 3373 3374 3375 3376 3377 3378 3379 3380 3381 3382 3383 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 | return SCPE_OK; } t_stat help_cmd (int32 flag, CONST char *cptr) { char gbuf[CBUFSIZE], gbuf2[CBUFSIZE]; CTAB *cmdp; DEVICE *dptr; UNIT *uptr; t_stat r; t_bool explicit_device = FALSE; GET_SWITCHES (cptr); /* get switches */ if (sim_switches & SWMASK ('F')) flag = flag | SCP_HELP_FLAT; if (*cptr) { cptr = get_glyph (cptr, gbuf, 0); if (0 == strcmp (gbuf, "DEVICE")) { explicit_device = TRUE; cptr = get_glyph (cptr, gbuf, 0); } dptr = find_unit (gbuf, &uptr); if ((dptr == NULL) && ((dptr = find_dev (gbuf)) == NULL)) { if (explicit_device) return sim_messagef (SCPE_ARG, "No such device %s\n", gbuf); if ((cmdp = find_cmd (gbuf))) { if (*cptr) { if ((cmdp->action == &set_cmd) || (cmdp->action == &show_cmd)) { DEVICE *dptr; UNIT *uptr; t_stat r; cptr = get_glyph (cptr, gbuf, 0); dptr = find_unit (gbuf, &uptr); if (dptr == NULL) dptr = find_dev (gbuf); if (dptr != NULL) { r = help_dev_help (stdout, dptr, uptr, flag, (cmdp->action == &set_cmd) ? "SET" : "SHOW"); if (sim_log) help_dev_help (sim_log, dptr, uptr, flag | SCP_HELP_FLAT, (cmdp->action == &set_cmd) ? "SET" : "SHOW"); return r; } if (cmdp->action == &set_cmd) { /* HELP SET xxx (not device or unit) */ if ((cmdp = find_ctab (set_glob_tab, gbuf)) && (cmdp->help)) return help_cmd_output (flag, cmdp->help, cmdp->help_base); } else { /* HELP SHOW xxx (not device or unit) */ SHTAB *shptr = find_shtab (show_glob_tab, gbuf); if ((shptr == NULL) || (shptr->help == NULL) || (*shptr->help == '\0')) return SCPE_ARG; return help_cmd_output (flag, shptr->help, NULL); } return SCPE_ARG; } } if (cmdp->help) { if (strcmp (cmdp->name, "HELP") == 0) { DEVICE *dptr; int i; for (i = 0; (dptr = sim_devices[i]) != NULL; i++) { if (dptr->help) sim_printf ("h{elp} %-17s display help for device %s\n", dptr->name, dptr->name); if (dptr->attach_help || (DEV_TYPE(dptr) == DEV_MUX) || (DEV_TYPE(dptr) == DEV_DISK) || (DEV_TYPE(dptr) == DEV_TAPE)) { sim_printf ("h{elp} %s ATTACH\t display help for device %s ATTACH command\n", dptr->name, dptr->name); } if (dptr->registers) { if (dptr->registers->name != NULL) sim_printf ("h{elp} %s REGISTERS\t display help for device %s register variables\n", dptr->name, dptr->name); } if (dptr->modifiers) { MTAB *mptr; for (mptr = dptr->modifiers; mptr->pstring != NULL; mptr++) { if (mptr->help) { sim_printf ("h{elp} %s SET\t\t display help for device %s SET commands (modifiers)\n", dptr->name, dptr->name); break; } } } } } else { if (((cmdp->action == &exdep_cmd) || (0 == strcmp(cmdp->name, "BOOT"))) && sim_dflt_dev->help) { sim_dflt_dev->help (stdout, sim_dflt_dev, sim_dflt_dev->units, 0, cmdp->name); if (sim_log) sim_dflt_dev->help (sim_log, sim_dflt_dev, sim_dflt_dev->units, 0, cmdp->name); } } strlcpy (gbuf2, cmdp->help, sizeof (gbuf2)); if (*cptr) { strlcat (gbuf2, " ", sizeof (gbuf2)); strlcat (gbuf2, cptr, sizeof (gbuf2)); } help_cmd_output (flag, gbuf2, cmdp->help_base); } else { /* no help so it is likely a command alias */ CTAB *cmdpa; for (cmdpa=cmd_table; cmdpa->name != NULL; cmdpa++) if ((cmdpa->action == cmdp->action) && (cmdpa->help)) { sim_printf ("%s is an alias for the %s command:\n%s", cmdp->name, cmdpa->name, cmdpa->help); break; } if (cmdpa->name == NULL) /* not found? */ sim_printf ("No help available for the %s command\n", cmdp->name); } } } else { if (dptr->flags & DEV_DISABLE) sim_printf ("Device %s is currently disabled\n", dptr->name); r = help_dev_help (stdout, dptr, uptr, flag, cptr); if (sim_log) help_dev_help (sim_log, dptr, uptr, flag | SCP_HELP_FLAT, cptr); return r; } } else { |
︙ | ︙ | |||
4986 4987 4988 4989 4990 4991 4992 | if ((MATCH_CMD (gbuf, "CONTROL_C") == 0) || (MATCH_CMD (gbuf, "SIGINT") == 0)) cond = ON_SIGINT_ACTION; /* Special case */ else return sim_messagef (SCPE_ARG, "Invalid argument: %s\n", gbuf); } } | < < > > | 5002 5003 5004 5005 5006 5007 5008 5009 5010 5011 5012 5013 5014 5015 5016 5017 5018 5019 5020 5021 | if ((MATCH_CMD (gbuf, "CONTROL_C") == 0) || (MATCH_CMD (gbuf, "SIGINT") == 0)) cond = ON_SIGINT_ACTION; /* Special case */ else return sim_messagef (SCPE_ARG, "Invalid argument: %s\n", gbuf); } } if ((NULL == cptr) || ('\0' == *cptr)) { /* Empty Action */ free(sim_on_actions[sim_do_depth][cond]); /* Clear existing condition */ sim_on_actions[sim_do_depth][cond] = NULL; } else { if ((cptr > sim_sub_instr_buf) && ((size_t)(cptr - sim_sub_instr_buf) < sim_sub_instr_size)) cptr = &sim_sub_instr[sim_sub_instr_off[cptr - sim_sub_instr_buf]]; /* get un-substituted string */ sim_on_actions[sim_do_depth][cond] = (char *)realloc(sim_on_actions[sim_do_depth][cond], 1+strlen(cptr)); strcpy(sim_on_actions[sim_do_depth][cond], cptr); } return SCPE_OK; } |
︙ | ︙ | |||
7331 7332 7333 7334 7335 7336 7337 7338 7339 7340 7341 7342 7343 7344 | WRITE_I (uptr->u5); /* [V3.0] more unit */ WRITE_I (uptr->u6); WRITE_I (uptr->flags); /* [V2.10] flags */ WRITE_I (uptr->dynflags); WRITE_I (uptr->wait); WRITE_I (uptr->buf); WRITE_I (uptr->recsize); WRITE_I (uptr->capac); /* [V3.5] capacity */ fprintf (sfile, "%.0f\n", uptr->usecs_remaining);/* [V4.0] remaining wait */ WRITE_I (uptr->pos); if (uptr->flags & UNIT_ATT) { fputs (uptr->filename, sfile); if ((uptr->flags & UNIT_BUF) && /* writable buffered */ uptr->hwmark && /* files need to be */ | > | 7347 7348 7349 7350 7351 7352 7353 7354 7355 7356 7357 7358 7359 7360 7361 | WRITE_I (uptr->u5); /* [V3.0] more unit */ WRITE_I (uptr->u6); WRITE_I (uptr->flags); /* [V2.10] flags */ WRITE_I (uptr->dynflags); WRITE_I (uptr->wait); WRITE_I (uptr->buf); WRITE_I (uptr->recsize); WRITE_I (uptr->tape_eom); WRITE_I (uptr->capac); /* [V3.5] capacity */ fprintf (sfile, "%.0f\n", uptr->usecs_remaining);/* [V4.0] remaining wait */ WRITE_I (uptr->pos); if (uptr->flags & UNIT_ATT) { fputs (uptr->filename, sfile); if ((uptr->flags & UNIT_BUF) && /* writable buffered */ uptr->hwmark && /* files need to be */ |
︙ | ︙ | |||
7582 7583 7584 7585 7586 7587 7588 7589 7590 7591 7592 7593 7594 7595 | READ_I (uptr->u6); READ_I (flg); /* [V2.10+] unit flags */ if (v40) { /* [V4.0+] dynflags */ READ_I (uptr->dynflags); READ_I (uptr->wait); READ_I (uptr->buf); READ_I (uptr->recsize); } old_capac = uptr->capac; /* save current capacity */ if (v35) { /* [V3.5+] capacity */ READ_I (uptr->capac); } if (v40) { READ_S (buf); | > | 7599 7600 7601 7602 7603 7604 7605 7606 7607 7608 7609 7610 7611 7612 7613 | READ_I (uptr->u6); READ_I (flg); /* [V2.10+] unit flags */ if (v40) { /* [V4.0+] dynflags */ READ_I (uptr->dynflags); READ_I (uptr->wait); READ_I (uptr->buf); READ_I (uptr->recsize); READ_I (uptr->tape_eom); } old_capac = uptr->capac; /* save current capacity */ if (v35) { /* [V3.5+] capacity */ READ_I (uptr->capac); } if (v40) { READ_S (buf); |
︙ | ︙ | |||
8042 8043 8044 8045 8046 8047 8048 8049 8050 8051 8052 8053 8054 8055 | sim_brk_set (addrs[i], BRK_TYP_DYN_STEPOVER, 0, NULL); } else sim_step = 1; if (sim_step) /* set step timer */ sim_activate (&sim_step_unit, sim_step); } while (1); if ((SCPE_BARE_STATUS(r) == SCPE_STOP) && /* WRU exit from sim_instr() */ (sim_on_actions[sim_do_depth][SCPE_STOP] == NULL) &&/* without a handler for a STOP condition */ (sim_on_actions[sim_do_depth][0] == NULL)) sim_os_ms_sleep (sim_stop_sleep_ms); /* wait a bit for SIGINT */ sim_is_running = FALSE; /* flag idle */ sim_stop_timer_services (); /* disable wall clock timing */ | > > > > | 8060 8061 8062 8063 8064 8065 8066 8067 8068 8069 8070 8071 8072 8073 8074 8075 8076 8077 | sim_brk_set (addrs[i], BRK_TYP_DYN_STEPOVER, 0, NULL); } else sim_step = 1; if (sim_step) /* set step timer */ sim_activate (&sim_step_unit, sim_step); } while (1); if ((SCPE_BARE_STATUS(r) == SCPE_STOP) && sigterm_received) r = SCPE_SIGTERM; if ((SCPE_BARE_STATUS(r) == SCPE_STOP) && /* WRU exit from sim_instr() */ (sim_on_actions[sim_do_depth][SCPE_STOP] == NULL) &&/* without a handler for a STOP condition */ (sim_on_actions[sim_do_depth][0] == NULL)) sim_os_ms_sleep (sim_stop_sleep_ms); /* wait a bit for SIGINT */ sim_is_running = FALSE; /* flag idle */ sim_stop_timer_services (); /* disable wall clock timing */ |
︙ | ︙ | |||
8194 8195 8196 8197 8198 8199 8200 8201 8202 8203 8204 8205 8206 8207 | } /* Signal handler for ^C signal - set stop simulation flag */ void int_handler (int sig) { stop_cpu = TRUE; } /* Examine/deposit commands ex[amine] [modifiers] list examine de[posit] [modifiers] list val deposit ie[xamine] [modifiers] list interactive examine | > > | 8216 8217 8218 8219 8220 8221 8222 8223 8224 8225 8226 8227 8228 8229 8230 8231 | } /* Signal handler for ^C signal - set stop simulation flag */ void int_handler (int sig) { stop_cpu = TRUE; if (sig == SIGTERM) sigterm_received = TRUE; } /* Examine/deposit commands ex[amine] [modifiers] list examine de[posit] [modifiers] list val deposit ie[xamine] [modifiers] list interactive examine |
︙ | ︙ |
Changes to src/SIMH/sim_console.c.
︙ | ︙ | |||
3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 | /* Note: This routine catches all the potential events which some aspect of the windows system can generate. The CTRL_C_EVENT won't be generated by a user typing in a console session since that session is in RAW mode. In general, Ctrl-C on a simulator's console terminal is a useful character to be passed to the simulator. This code does nothing to disable or affect that. */ static BOOL WINAPI ControlHandler(DWORD dwCtrlType) { DWORD Mode; extern void int_handler (int sig); switch (dwCtrlType) { case CTRL_BREAK_EVENT: // Use CTRL-Break or CTRL-C to simulate case CTRL_C_EVENT: // SERVICE_CONTROL_STOP in debug mode | > > | | | 3384 3385 3386 3387 3388 3389 3390 3391 3392 3393 3394 3395 3396 3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 3411 3412 3413 3414 3415 3416 3417 3418 | /* Note: This routine catches all the potential events which some aspect of the windows system can generate. The CTRL_C_EVENT won't be generated by a user typing in a console session since that session is in RAW mode. In general, Ctrl-C on a simulator's console terminal is a useful character to be passed to the simulator. This code does nothing to disable or affect that. */ #include <signal.h> static BOOL WINAPI ControlHandler(DWORD dwCtrlType) { DWORD Mode; extern void int_handler (int sig); switch (dwCtrlType) { case CTRL_BREAK_EVENT: // Use CTRL-Break or CTRL-C to simulate case CTRL_C_EVENT: // SERVICE_CONTROL_STOP in debug mode int_handler(SIGINT); return TRUE; case CTRL_CLOSE_EVENT: // Window is Closing case CTRL_LOGOFF_EVENT: // User is logging off if (!GetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), &Mode)) return TRUE; // Not our User, so ignore /* fall through */ case CTRL_SHUTDOWN_EVENT: // System is shutting down int_handler(SIGTERM); return TRUE; } return FALSE; } static t_stat sim_os_ttinit (void) { |
︙ | ︙ |
Changes to src/SIMH/sim_defs.h.
︙ | ︙ | |||
411 412 413 414 415 416 417 418 | #define SCPE_STALL (SCPE_BASE + 41) /* Telnet conn stall */ #define SCPE_AFAIL (SCPE_BASE + 42) /* assert failed */ #define SCPE_INVREM (SCPE_BASE + 43) /* invalid remote console command */ #define SCPE_EXPECT (SCPE_BASE + 44) /* expect matched */ #define SCPE_AMBREG (SCPE_BASE + 45) /* ambiguous register */ #define SCPE_REMOTE (SCPE_BASE + 46) /* remote console command */ #define SCPE_INVEXPR (SCPE_BASE + 47) /* invalid expression */ | > | | 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | #define SCPE_STALL (SCPE_BASE + 41) /* Telnet conn stall */ #define SCPE_AFAIL (SCPE_BASE + 42) /* assert failed */ #define SCPE_INVREM (SCPE_BASE + 43) /* invalid remote console command */ #define SCPE_EXPECT (SCPE_BASE + 44) /* expect matched */ #define SCPE_AMBREG (SCPE_BASE + 45) /* ambiguous register */ #define SCPE_REMOTE (SCPE_BASE + 46) /* remote console command */ #define SCPE_INVEXPR (SCPE_BASE + 47) /* invalid expression */ #define SCPE_SIGTERM (SCPE_BASE + 48) /* SIGTERM has been received */ #define SCPE_MAX_ERR (SCPE_BASE + 48) /* Maximum SCPE Error Value */ #define SCPE_KFLAG 0x10000000 /* tti data flag */ #define SCPE_BREAK 0x20000000 /* tti break flag */ #define SCPE_NOMESSAGE 0x40000000 /* message display supression flag */ #define SCPE_BARE_STATUS(stat) ((stat) & ~(SCPE_NOMESSAGE|SCPE_KFLAG|SCPE_BREAK)) /* Print value format codes */ |
︙ | ︙ | |||
587 588 589 590 591 592 593 | int32 u5; /* device specific */ int32 u6; /* device specific */ void *up7; /* device specific */ void *up8; /* device specific */ uint16 us9; /* device specific */ uint16 us10; /* device specific */ void *tmxr; /* TMXR linkage */ | | > | 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 | int32 u5; /* device specific */ int32 u6; /* device specific */ void *up7; /* device specific */ void *up8; /* device specific */ uint16 us9; /* device specific */ uint16 us10; /* device specific */ void *tmxr; /* TMXR linkage */ uint32 recsize; /* Tape specific info */ t_addr tape_eom; /* Tape specific info */ t_bool (*cancel)(UNIT *); double usecs_remaining; /* time balance for long delays */ char *uname; /* Unit name */ DEVICE *dptr; /* DEVICE linkage (backpointer) */ uint32 dctrl; /* debug control */ #ifdef SIM_ASYNCH_IO void (*a_check_completion)(UNIT *); |
︙ | ︙ |
Changes to src/SIMH/sim_ether.c.
︙ | ︙ | |||
1198 1199 1200 1201 1202 1203 1204 | break; } return (lib_loaded == 1) ? 1 : 0; } /* define functions with dynamic revectoring */ void pcap_close(pcap_t* a) { | | | | | | | | | | | 1198 1199 1200 1201 1202 1203 1204 1205 1206 1207 1208 1209 1210 1211 1212 1213 1214 1215 1216 1217 1218 1219 1220 1221 1222 1223 1224 1225 1226 1227 1228 1229 1230 1231 1232 1233 1234 1235 1236 1237 1238 1239 1240 1241 1242 1243 1244 1245 1246 1247 1248 1249 1250 1251 1252 1253 1254 1255 1256 1257 1258 1259 1260 1261 1262 1263 1264 1265 1266 1267 1268 1269 1270 1271 1272 | break; } return (lib_loaded == 1) ? 1 : 0; } /* define functions with dynamic revectoring */ void pcap_close(pcap_t* a) { if (a && (load_pcap() != 0)) { p_pcap_close(a); } } /* Some platforms's pcap.h have an ancient declaration of pcap_compile which doesn't have a const in the bpf string argument */ #if !defined (BPF_CONST_STRING) int pcap_compile(pcap_t* a, struct bpf_program* b, char* c, int d, bpf_u_int32 e) { #else int pcap_compile(pcap_t* a, struct bpf_program* b, const char* c, int d, bpf_u_int32 e) { #endif if (a && (load_pcap() != 0)) { return p_pcap_compile(a, b, c, d, e); } else { return 0; } } int pcap_datalink(pcap_t* a) { if (a && (load_pcap() != 0)) { return p_pcap_datalink(a); } else { return 0; } } int pcap_dispatch(pcap_t* a, int b, pcap_handler c, u_char* d) { if (a && (load_pcap() != 0)) { return p_pcap_dispatch(a, b, c, d); } else { return 0; } } int pcap_findalldevs(pcap_if_t** a, char* b) { if (a && (load_pcap() != 0)) { return p_pcap_findalldevs(a, b); } else { *a = 0; strcpy(b, no_pcap); return -1; } } void pcap_freealldevs(pcap_if_t* a) { if (a && (load_pcap() != 0)) { p_pcap_freealldevs(a); } } void pcap_freecode(struct bpf_program* a) { if (a && (load_pcap() != 0)) { p_pcap_freecode(a); } } char* pcap_geterr(pcap_t* a) { if (a && (load_pcap() != 0)) { return p_pcap_geterr(a); } else { return (char*) ""; } } int pcap_lookupnet(const char* a, bpf_u_int32* b, bpf_u_int32* c, char* d) { if (load_pcap() != 0) { return p_pcap_lookupnet(a, b, c, d); } else { |
︙ | ︙ | |||
1280 1281 1282 1283 1284 1285 1286 | } else { return (pcap_t*) 0; } } #ifdef _WIN32 int pcap_setmintocopy(pcap_t* a, int b) { | | | | | | | | | | 1280 1281 1282 1283 1284 1285 1286 1287 1288 1289 1290 1291 1292 1293 1294 1295 1296 1297 1298 1299 1300 1301 1302 1303 1304 1305 1306 1307 1308 1309 1310 1311 1312 1313 1314 1315 1316 1317 1318 1319 1320 1321 1322 1323 1324 1325 1326 1327 1328 1329 1330 1331 1332 1333 1334 1335 1336 1337 1338 1339 1340 1341 1342 1343 1344 1345 1346 | } else { return (pcap_t*) 0; } } #ifdef _WIN32 int pcap_setmintocopy(pcap_t* a, int b) { if (a && (load_pcap() != 0)) { return p_pcap_setmintocopy(a, b); } else { return -1; } } HANDLE pcap_getevent(pcap_t* a) { if (a && (load_pcap() != 0)) { return p_pcap_getevent(a); } else { return (HANDLE) 0; } } #else #ifdef MUST_DO_SELECT int pcap_get_selectable_fd(pcap_t* a) { if (a && (load_pcap() != 0)) { return p_pcap_get_selectable_fd(a); } else { return 0; } } #endif int pcap_fileno(pcap_t * a) { if (a && (load_pcap() != 0)) { return p_pcap_fileno(a); } else { return 0; } } #endif int pcap_sendpacket(pcap_t* a, const u_char* b, int c) { if (a && (load_pcap() != 0)) { return p_pcap_sendpacket(a, b, c); } else { return 0; } } int pcap_setfilter(pcap_t* a, struct bpf_program* b) { if (a && (load_pcap() != 0)) { return p_pcap_setfilter(a, b); } else { return 0; } } int pcap_setnonblock(pcap_t* a, int nonblock, char *errbuf) { if (a && (load_pcap() != 0)) { return p_pcap_setnonblock(a, nonblock, errbuf); } else { return 0; } } #endif /* defined(USE_SHARED) && (defined(_WIN32) || defined(HAVE_DLOPEN)) */ |
︙ | ︙ | |||
2178 2179 2180 2181 2182 2183 2184 | This is required in order to fake the src address. */ if (1) { int one = 1; ioctl(pcap_fileno(*handle), BIOCSHDRCMPLT, &one); } #endif /* xBSD */ #if defined(_WIN32) | | > > > > > > | 2178 2179 2180 2181 2182 2183 2184 2185 2186 2187 2188 2189 2190 2191 2192 2193 2194 2195 2196 2197 2198 | This is required in order to fake the src address. */ if (1) { int one = 1; ioctl(pcap_fileno(*handle), BIOCSHDRCMPLT, &one); } #endif /* xBSD */ #if defined(_WIN32) if ((pcap_setmintocopy ((pcap_t*)(*handle), 0) == -1) || (pcap_getevent ((pcap_t*)(*handle)) == NULL)) { pcap_close ((pcap_t*)(*handle)); errbuf[PCAP_ERRBUF_SIZE-1] = '\0'; snprintf (errbuf, PCAP_ERRBUF_SIZE-1, "pcap can't initialize API for interface: %s", savname); return SCPE_OPENERR; } #endif #if !defined (USE_READER_THREAD) #ifdef USE_SETNONBLOCK /* set ethernet device non-blocking so pcap_dispatch() doesn't hang */ if (pcap_setnonblock (*handle, 1, errbuf) == -1) { sim_printf ("Eth: Failed to set non-blocking: %s\n", errbuf); } |
︙ | ︙ | |||
4166 4167 4168 4169 4170 4171 4172 4173 4174 4175 4176 4177 4178 4179 | t_stat eth_test_bpf (DEVICE *dptr) { int errors = 0; #ifdef USE_BPF t_stat r; DEVICE eth_tst; ETH_DEV dev; int reflections, all_multicast, promiscuous; char buf[116+66*ETH_FILTER_MAX]; char mac[20]; ETH_MAC filter_address[3] = { {0x04, 0x05, 0x06, 0x07, 0x08, 0x09}, {0x09, 0x00, 0x2B, 0x02, 0x01, 0x07}, {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, | > > > > | 4172 4173 4174 4175 4176 4177 4178 4179 4180 4181 4182 4183 4184 4185 4186 4187 4188 4189 | t_stat eth_test_bpf (DEVICE *dptr) { int errors = 0; #ifdef USE_BPF t_stat r; DEVICE eth_tst; ETH_DEV dev; int eth_num; int eth_opened; ETH_LIST eth_list[ETH_MAX_DEVICE]; int eth_device_count; int reflections, all_multicast, promiscuous; char buf[116+66*ETH_FILTER_MAX]; char mac[20]; ETH_MAC filter_address[3] = { {0x04, 0x05, 0x06, 0x07, 0x08, 0x09}, {0x09, 0x00, 0x2B, 0x02, 0x01, 0x07}, {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF}, |
︙ | ︙ | |||
4211 4212 4213 4214 4215 4216 4217 | eth_mac_fmt(host_phy_addr_list[host_phy_addr_listindex], mac);\ sim_printf ("Eth: host_nic_phy_hw_addr: %s\n", mac); \ } \ } memset (ð_tst, 0, sizeof(eth_tst)); | > | > > > > > > > > > > > > > > > > | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | > > | > > > > > | | 4221 4222 4223 4224 4225 4226 4227 4228 4229 4230 4231 4232 4233 4234 4235 4236 4237 4238 4239 4240 4241 4242 4243 4244 4245 4246 4247 4248 4249 4250 4251 4252 4253 4254 4255 4256 4257 4258 4259 4260 4261 4262 4263 4264 4265 4266 4267 4268 4269 4270 4271 4272 4273 4274 4275 4276 4277 4278 4279 4280 4281 4282 4283 4284 4285 4286 4287 4288 4289 4290 4291 4292 4293 4294 4295 4296 4297 4298 4299 4300 4301 4302 4303 4304 4305 4306 4307 4308 4309 4310 4311 | eth_mac_fmt(host_phy_addr_list[host_phy_addr_listindex], mac);\ sim_printf ("Eth: host_nic_phy_hw_addr: %s\n", mac); \ } \ } memset (ð_tst, 0, sizeof(eth_tst)); eth_device_count = eth_devices(ETH_MAX_DEVICE, eth_list); eth_opened = 0; for (eth_num=0; eth_num<eth_device_count; eth_num++) { char eth_name[32]; if ((0 == memcmp (eth_list[eth_num].name, "nat:", 4)) || (0 == memcmp (eth_list[eth_num].name, "tap:", 4)) || (0 == memcmp (eth_list[eth_num].name, "vde:", 4)) || (0 == memcmp (eth_list[eth_num].name, "udp:", 4))) continue; eth_name[sizeof (eth_name)-1] = '\0'; snprintf (eth_name, sizeof (eth_name)-1, "eth%d", eth_num); r = eth_open(&dev, eth_name, ð_tst, 1); if (r != SCPE_OK) { sim_printf ("%s: Eth: Error opening eth%d: %s\n", dptr->name, eth_num, sim_error_text (r)); continue; } ++eth_opened; for (reflections=0; reflections<=1; reflections++) { for (all_multicast=0; all_multicast<=1; all_multicast++) { for (promiscuous=0; promiscuous<=1; promiscuous++) { for (addr_count=1; addr_count<=2; addr_count++) { for (hash_listindex=0; hash_listindex<=1; hash_listindex++) { for (host_phy_addr_listindex=0; host_phy_addr_listindex<=1; host_phy_addr_listindex++) { int i; char errbuf[PCAP_ERRBUF_SIZE]; ++bpf_count; r = eth_bpf_filter (&dev, addr_count, &filter_address[0], all_multicast, promiscuous, reflections, &filter_address[0], host_phy_addr_list[host_phy_addr_listindex], hash_list[hash_listindex], buf); if (r != SCPE_OK) { ++bpf_construct_error_count; sim_printf ("Eth: Error producing a BPF filter for:\n"); SIM_PRINT_BPF_ARGUMENTS; } else { if (sim_switches & SWMASK('D')) { SIM_PRINT_BPF_ARGUMENTS; sim_printf ("Eth: BPF string is: |%s|\n", buf); } if (dev.eth_api == ETH_API_PCAP) { struct bpf_program bpf; if (pcap_compile ((pcap_t*)dev.handle, &bpf, buf, 1, (bpf_u_int32)0) < 0) { ++bpf_compile_error_count; sprintf(errbuf, "%s", pcap_geterr((pcap_t*)dev.handle)); sim_printf("Eth: pcap_compile error: %s\n", errbuf); if (!(sim_switches & SWMASK('D'))) { /* show erroneous BPF string */ SIM_PRINT_BPF_ARGUMENTS; sim_printf ("Eth: BPF string is: |%s|\n", buf); } } pcap_freecode(&bpf); } else ++bpf_compile_skip_count; } } } } } } } eth_close(&dev); } if (eth_opened == 0) { errors = 1; sim_printf ("%s: No testable LAN interfaces found\n", dptr->name); } if (bpf_count) sim_printf ("BPF Filter Count: %d\n", bpf_count); if (bpf_construct_error_count) sim_printf ("BPF Construct Errors: %d\n", bpf_construct_error_count); if (bpf_compile_error_count) sim_printf ("BPF Compile Errors: %d\n", bpf_compile_error_count); if (bpf_compile_skip_count) sim_printf ("BPF Compile Skipped: %d\n", bpf_compile_skip_count); #endif /* USE_BPF */ |
︙ | ︙ |
Changes to src/SIMH/sim_serial.c.
︙ | ︙ | |||
807 808 809 810 811 812 813 | if (bits_to_clear&TMXR_MDM_RTS) if (!EscapeCommFunction (port->hPort, CLRRTS)) { sim_error_serial ("EscapeCommFunction", (int) GetLastError ()); return SCPE_IOERR; } if (incoming_bits) { DWORD ModemStat; | | | 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 | if (bits_to_clear&TMXR_MDM_RTS) if (!EscapeCommFunction (port->hPort, CLRRTS)) { sim_error_serial ("EscapeCommFunction", (int) GetLastError ()); return SCPE_IOERR; } if (incoming_bits) { DWORD ModemStat; if (!GetCommModemStatus (port->hPort, &ModemStat)) { sim_error_serial ("GetCommModemStatus", (int) GetLastError ()); return SCPE_IOERR; } *incoming_bits = ((ModemStat&MS_CTS_ON) ? TMXR_MDM_CTS : 0) | ((ModemStat&MS_DSR_ON) ? TMXR_MDM_DSR : 0) | ((ModemStat&MS_RING_ON) ? TMXR_MDM_RNG : 0) | ((ModemStat&MS_RLSD_ON) ? TMXR_MDM_DCD : 0); |
︙ | ︙ |
Changes to src/SIMH/sim_tape.c.
︙ | ︙ | |||
128 129 130 131 132 133 134 | #define BPI_COUNT (sizeof (bpi) / sizeof (bpi [0])) /* count of density table entries */ static t_stat sim_tape_ioerr (UNIT *uptr); static t_stat sim_tape_wrdata (UNIT *uptr, uint32 dat); static t_stat sim_tape_aws_wrdata (UNIT *uptr, uint8 *buf, t_mtrlnt bc); static uint32 sim_tape_tpc_map (UNIT *uptr, t_addr *map, uint32 mapsize); | | | 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 | #define BPI_COUNT (sizeof (bpi) / sizeof (bpi [0])) /* count of density table entries */ static t_stat sim_tape_ioerr (UNIT *uptr); static t_stat sim_tape_wrdata (UNIT *uptr, uint32 dat); static t_stat sim_tape_aws_wrdata (UNIT *uptr, uint8 *buf, t_mtrlnt bc); static uint32 sim_tape_tpc_map (UNIT *uptr, t_addr *map, uint32 mapsize); static t_stat sim_tape_validate_tape (UNIT *uptr); static t_addr sim_tape_tpc_fnd (UNIT *uptr, t_addr *map); static void sim_tape_data_trace (UNIT *uptr, const uint8 *data, size_t len, const char* txt, int detail, uint32 reason); static t_stat tape_erase_fwd (UNIT *uptr, t_mtrlnt gap_size); static t_stat tape_erase_rev (UNIT *uptr, t_mtrlnt gap_size); struct tape_context { DEVICE *dptr; /* Device for unit (access to debug flags) */ |
︙ | ︙ | |||
544 545 546 547 548 549 550 | break; default: break; } if (r == SCPE_OK) { | | > | 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 | break; default: break; } if (r == SCPE_OK) { sim_tape_validate_tape (uptr); sim_tape_rewind (uptr); #if defined (SIM_ASYNCH_IO) sim_tape_set_async (uptr, completion_delay); #endif uptr->io_flush = _sim_tape_io_flush; |
︙ | ︙ | |||
602 603 604 605 606 607 608 609 610 611 612 613 614 615 | break; default: break; } uptr->hwmark = 0; uptr->recsize = 0; sim_tape_rewind (uptr); free (uptr->tape_ctx); uptr->tape_ctx = NULL; uptr->io_flush = NULL; if (auto_format) /* format was determined or specified at attach time? */ sim_tape_set_fmt (uptr, 0, "SIMH", NULL); /* restore default format */ | > | 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 | break; default: break; } uptr->hwmark = 0; uptr->recsize = 0; uptr->tape_eom = 0; sim_tape_rewind (uptr); free (uptr->tape_ctx); uptr->tape_ctx = NULL; uptr->io_flush = NULL; if (auto_format) /* format was determined or specified at attach time? */ sim_tape_set_fmt (uptr, 0, "SIMH", NULL); /* restore default format */ |
︙ | ︙ | |||
640 641 642 643 644 645 646 | fprintf (st, " is SIMH, alternatives are E11, TPC, P7B, AWS and TAR)\n"); fprintf (st, " -B For TAR format tapes, the record size for data read from the\n"); fprintf (st, " specified file. This record size will be used for all but\n"); fprintf (st, " possibly the last record which will be what remains unread.\n"); fprintf (st, " The default TAR record size is 10240.\n"); fprintf (st, " -V Display some summary information about the record structure\n"); fprintf (st, " contained in the tape image scan performed when it is attached.\n"); | | | > > | 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 | fprintf (st, " is SIMH, alternatives are E11, TPC, P7B, AWS and TAR)\n"); fprintf (st, " -B For TAR format tapes, the record size for data read from the\n"); fprintf (st, " specified file. This record size will be used for all but\n"); fprintf (st, " possibly the last record which will be what remains unread.\n"); fprintf (st, " The default TAR record size is 10240.\n"); fprintf (st, " -V Display some summary information about the record structure\n"); fprintf (st, " contained in the tape image scan performed when it is attached.\n"); fprintf (st, " -L Display detailed record size counts observed during attach\n"); fprintf (st, " validation pass\n"); fprintf (st, " contained in the tape image scan performed when it is attached.\n"); fprintf (st, " -D Causes the internal tape structure information to be displayed\n"); fprintf (st, " while the tape image is scanned.\n"); return SCPE_OK; } static void sim_tape_data_trace(UNIT *uptr, const uint8 *data, size_t len, const char* txt, int detail, uint32 reason) { struct tape_context *ctx = (struct tape_context *)uptr->tape_ctx; if (ctx == NULL) return; if (sim_deb && ((uptr->dctrl | ctx->dptr->dctrl) & reason)) sim_data_trace(ctx->dptr, uptr, (detail ? data : NULL), "", len, txt, reason); } /* Read record length forward (internal routine). Inputs: uptr = pointer to tape unit bc = pointer to returned record length Outputs: status = operation status exit condition tape position ------------------ ----------------------------------------------------- unit unattached unchanged read error unchanged, PNU set |
︙ | ︙ | |||
767 768 769 770 771 772 773 774 775 776 | t_stat status = MTSE_OK; MT_CLR_PNU (uptr); /* clear the position-not-updated flag */ *bc = 0; if ((uptr->flags & UNIT_ATT) == 0) /* if the unit is not attached */ return MTSE_UNATT; /* then quit with an error */ if (sim_fseek (uptr->fileref, uptr->pos, SEEK_SET)) { /* set the initial tape position; if it fails */ MT_SET_PNU (uptr); /* then set position not updated */ | > > > > > > | | | 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 | t_stat status = MTSE_OK; MT_CLR_PNU (uptr); /* clear the position-not-updated flag */ *bc = 0; if ((uptr->flags & UNIT_ATT) == 0) /* if the unit is not attached */ return MTSE_UNATT; /* then quit with an error */ if ((uptr->tape_eom) && (uptr->pos >= uptr->tape_eom)) { MT_SET_PNU (uptr); /* then set position not updated */ return MTSE_EOM; /* and quit with I/O error status */ } if (sim_fseek (uptr->fileref, uptr->pos, SEEK_SET)) { /* set the initial tape position; if it fails */ MT_SET_PNU (uptr); /* then set position not updated */ return sim_tape_ioerr (uptr); /* and quit with I/O error status */ } switch (f) { /* otherwise the read method depends on the tape format */ case MTUF_F_STD: case MTUF_F_E11: runaway_counter = 25 * 12 * bpi [MT_DENS (uptr->dynflags)]; /* set the largest legal gap size in bytes */ if (runaway_counter == 0) { /* if tape density has not been not set */ sizeof_gap = 0; /* then disable runaway detection */ |
︙ | ︙ | |||
825 826 827 828 829 830 831 832 833 834 835 836 837 838 | } else if (bufcap == 0 /* otherwise if positioned at the physical EOF */ || buffer [0] == MTR_EOM) /* or at the logical EOM */ if (bufcntr == 0) { /* then if this is the initial read */ MT_SET_PNU (uptr); /* then set position not updated */ status = MTSE_EOM; /* and report the end-of-medium and quit */ break; } else { /* otherwise some gap has already been skipped */ if (sizeof_gap > 0) /* so if detection is enabled */ status = MTSE_RUNAWAY; /* then report a tape runaway */ else /* otherwise report the physical EOF */ | > | 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 | } else if (bufcap == 0 /* otherwise if positioned at the physical EOF */ || buffer [0] == MTR_EOM) /* or at the logical EOM */ if (bufcntr == 0) { /* then if this is the initial read */ MT_SET_PNU (uptr); /* then set position not updated */ status = MTSE_EOM; /* and report the end-of-medium and quit */ uptr->tape_eom = uptr->pos; break; } else { /* otherwise some gap has already been skipped */ if (sizeof_gap > 0) /* so if detection is enabled */ status = MTSE_RUNAWAY; /* then report a tape runaway */ else /* otherwise report the physical EOF */ |
︙ | ︙ | |||
886 887 888 889 890 891 892 | } } while (*bc == MTR_GAP && runaway_counter > 0); /* continue until data or runaway occurs */ if (runaway_counter <= 0) /* if a tape runaway occurred */ status = MTSE_RUNAWAY; /* then report it */ | | < < < < > > > | | 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 | } } while (*bc == MTR_GAP && runaway_counter > 0); /* continue until data or runaway occurs */ if (runaway_counter <= 0) /* if a tape runaway occurred */ status = MTSE_RUNAWAY; /* then report it */ if (status == MTSE_OK) { /* Validate the reverse record size for data records */ t_mtrlnt rev_lnt; if (sim_fseek (uptr->fileref, uptr->pos - sizeof (t_mtrlnt), SEEK_SET)){ /* then seek to the end of record size; if it fails */ status = sim_tape_ioerr (uptr); /* then quit with I/O error status */ break; } (void)sim_fread (&rev_lnt, /* get the reverse length */ sizeof (t_mtrlnt), 1, uptr->fileref); if (ferror (uptr->fileref)) { /* if a file I/O error occurred */ status = sim_tape_ioerr (uptr); /* report the error and quit */ break; } if (rev_lnt != *bc) { /* size mismatch? */ status = MTSE_INVRL; uptr->pos -= (sizeof (t_mtrlnt) + *bc + sizeof (t_mtrlnt)); MT_SET_PNU (uptr); /* pos not upd */ break; } if (sim_fseek (uptr->fileref, saved_pos, SEEK_SET)) /* then seek back to the beginning of the data; if it fails */ status = sim_tape_ioerr (uptr); /* then quit with I/O error status */ } break; /* otherwise the operation succeeded */ case MTUF_F_TPC: (void)sim_fread (&tpcbc, sizeof (t_tpclnt), 1, uptr->fileref); *bc = (t_mtrlnt)tpcbc; /* save rec lnt */ if (ferror (uptr->fileref)) { /* error? */ MT_SET_PNU (uptr); /* pos not upd */ status = sim_tape_ioerr (uptr); } else { if ((feof (uptr->fileref)) || /* eof? */ ((tpcbc == TPC_EOM) && (sim_fsize (uptr->fileref) == (uint32)sim_ftell (uptr->fileref)))) { MT_SET_PNU (uptr); /* pos not upd */ status = MTSE_EOM; } else { uptr->pos += sizeof (t_tpclnt); /* spc over reclnt */ if (tpcbc == TPC_TMK) /* tape mark? */ status = MTSE_TMK; else uptr->pos = uptr->pos + ((tpcbc + 1) & ~1); /* spc over record */ } } break; |
︙ | ︙ | |||
1581 1582 1583 1584 1585 1586 1587 1588 1589 1590 1591 1592 1593 1594 | break; case MTUF_F_AWS: /* AWS */ status = sim_tape_aws_wrdata (uptr, buf, bc); if (status != MTSE_OK) return status; break; } sim_tape_data_trace(uptr, buf, sbc, "Record Written", (uptr->dctrl | ctx->dptr->dctrl) & MTSE_DBG_DAT, MTSE_DBG_STR); return MTSE_OK; } t_stat sim_tape_wrrecf_a (UNIT *uptr, uint8 *buf, t_mtrlnt bc, TAPE_PCALLBACK callback) { t_stat r = SCPE_OK; | > > | 1591 1592 1593 1594 1595 1596 1597 1598 1599 1600 1601 1602 1603 1604 1605 1606 | break; case MTUF_F_AWS: /* AWS */ status = sim_tape_aws_wrdata (uptr, buf, bc); if (status != MTSE_OK) return status; break; } if (uptr->pos > uptr->tape_eom) uptr->tape_eom = uptr->pos; /* update EOM as needed */ sim_tape_data_trace(uptr, buf, sbc, "Record Written", (uptr->dctrl | ctx->dptr->dctrl) & MTSE_DBG_DAT, MTSE_DBG_STR); return MTSE_OK; } t_stat sim_tape_wrrecf_a (UNIT *uptr, uint8 *buf, t_mtrlnt bc, TAPE_PCALLBACK callback) { t_stat r = SCPE_OK; |
︙ | ︙ | |||
1633 1634 1635 1636 1637 1638 1639 1640 1641 1642 1643 1644 1645 1646 | awshdr.prelen = bc; awshdr.nxtlen = 0; awshdr.rectyp = AWS_TMK; (void)sim_fwrite (&awshdr, sizeof (t_awslnt), 3, uptr->fileref); if (!replacing_record) sim_set_fsize (uptr->fileref, uptr->pos + sizeof (awshdr)); } return MTSE_OK; } /* Write metadata forward (internal routine) */ static t_stat sim_tape_wrdata (UNIT *uptr, uint32 dat) { | > > | 1645 1646 1647 1648 1649 1650 1651 1652 1653 1654 1655 1656 1657 1658 1659 1660 | awshdr.prelen = bc; awshdr.nxtlen = 0; awshdr.rectyp = AWS_TMK; (void)sim_fwrite (&awshdr, sizeof (t_awslnt), 3, uptr->fileref); if (!replacing_record) sim_set_fsize (uptr->fileref, uptr->pos + sizeof (awshdr)); } if (uptr->pos > uptr->tape_eom) uptr->tape_eom = uptr->pos; /* Update EOM if we're there */ return MTSE_OK; } /* Write metadata forward (internal routine) */ static t_stat sim_tape_wrdata (UNIT *uptr, uint32 dat) { |
︙ | ︙ | |||
1657 1658 1659 1660 1661 1662 1663 1664 1665 1666 1667 1668 1669 1670 | (void)sim_fwrite (&dat, sizeof (t_mtrlnt), 1, uptr->fileref); if (ferror (uptr->fileref)) { /* error? */ MT_SET_PNU (uptr); return sim_tape_ioerr (uptr); } sim_debug_unit (MTSE_DBG_STR, uptr, "wr_lnt: lnt: %d, pos: %" T_ADDR_FMT "u\n", dat, uptr->pos); uptr->pos = uptr->pos + sizeof (t_mtrlnt); /* move tape */ return MTSE_OK; } /* Write tape mark */ t_stat sim_tape_wrtmk (UNIT *uptr) { | > > | 1671 1672 1673 1674 1675 1676 1677 1678 1679 1680 1681 1682 1683 1684 1685 1686 | (void)sim_fwrite (&dat, sizeof (t_mtrlnt), 1, uptr->fileref); if (ferror (uptr->fileref)) { /* error? */ MT_SET_PNU (uptr); return sim_tape_ioerr (uptr); } sim_debug_unit (MTSE_DBG_STR, uptr, "wr_lnt: lnt: %d, pos: %" T_ADDR_FMT "u\n", dat, uptr->pos); uptr->pos = uptr->pos + sizeof (t_mtrlnt); /* move tape */ if (uptr->pos > uptr->tape_eom) uptr->tape_eom = uptr->pos; /* update EOM */ return MTSE_OK; } /* Write tape mark */ t_stat sim_tape_wrtmk (UNIT *uptr) { |
︙ | ︙ | |||
2645 2646 2647 2648 2649 2650 2651 2652 2653 2654 2655 2656 2657 2658 | if (uptr->flags & UNIT_ATT) { if (ctx == NULL) /* if not properly attached? */ return sim_messagef (SCPE_IERR, "Bad Attach\n");/* that's a problem */ sim_debug_unit (ctx->dbit, uptr, "sim_tape_rewind(unit=%d)\n", (int)(uptr-ctx->dptr->units)); } uptr->pos = 0; MT_CLR_PNU (uptr); MT_CLR_INMRK (uptr); /* Not within an AWS or TAR tapemark */ return MTSE_OK; } t_stat sim_tape_rewind_a (UNIT *uptr, TAPE_PCALLBACK callback) { | > > | 2661 2662 2663 2664 2665 2666 2667 2668 2669 2670 2671 2672 2673 2674 2675 2676 | if (uptr->flags & UNIT_ATT) { if (ctx == NULL) /* if not properly attached? */ return sim_messagef (SCPE_IERR, "Bad Attach\n");/* that's a problem */ sim_debug_unit (ctx->dbit, uptr, "sim_tape_rewind(unit=%d)\n", (int)(uptr-ctx->dptr->units)); } uptr->pos = 0; if (uptr->flags & UNIT_ATT) (void)sim_fseek (uptr->fileref, uptr->pos, SEEK_SET); MT_CLR_PNU (uptr); MT_CLR_INMRK (uptr); /* Not within an AWS or TAR tapemark */ return MTSE_OK; } t_stat sim_tape_rewind_a (UNIT *uptr, TAPE_PCALLBACK callback) { |
︙ | ︙ | |||
2919 2920 2921 2922 2923 2924 2925 | if (stat <= MTSE_MAX_ERR) return mtse_errors[stat]; sprintf(msgbuf, "Error %d", stat); return msgbuf; } | | > > < | | > > < < < | | | | | | | | | | | | | | > > | | | | | | | | | | | | < > > | | | | < | > | > | 2937 2938 2939 2940 2941 2942 2943 2944 2945 2946 2947 2948 2949 2950 2951 2952 2953 2954 2955 2956 2957 2958 2959 2960 2961 2962 2963 2964 2965 2966 2967 2968 2969 2970 2971 2972 2973 2974 2975 2976 2977 2978 2979 2980 2981 2982 2983 2984 2985 2986 2987 2988 2989 2990 2991 2992 2993 2994 2995 2996 2997 2998 2999 3000 3001 3002 3003 3004 3005 3006 3007 3008 3009 3010 3011 3012 3013 3014 3015 3016 3017 3018 3019 3020 3021 3022 3023 3024 3025 3026 3027 3028 3029 3030 3031 3032 3033 3034 3035 3036 3037 3038 3039 3040 3041 3042 3043 3044 3045 3046 3047 3048 3049 3050 3051 3052 3053 3054 3055 3056 3057 3058 3059 3060 3061 3062 3063 3064 3065 3066 3067 3068 3069 3070 3071 3072 3073 3074 3075 3076 3077 3078 3079 3080 3081 3082 3083 3084 3085 3086 3087 3088 3089 3090 3091 | if (stat <= MTSE_MAX_ERR) return mtse_errors[stat]; sprintf(msgbuf, "Error %d", stat); return msgbuf; } static t_stat sim_tape_validate_tape (UNIT *uptr) { t_addr saved_pos = uptr->pos; uint32 record_in_file = 0; uint32 data_total = 0; uint32 tapemark_total = 0; uint32 record_total = 0; uint32 unique_record_sizes = 0; uint32 remaining_data = 0; uint32 *rec_sizes = NULL; t_stat r = SCPE_OK; t_stat r_f; t_stat r_r; t_stat r_s; uint8 *buf_f = NULL; uint8 *buf_r = NULL; t_mtrlnt bc_f; t_mtrlnt bc_r; t_mtrlnt bc_s; t_mtrlnt bc; t_addr pos_f; t_addr pos_r; t_mtrlnt max = MTR_MAXLEN; if (!(uptr->flags & UNIT_ATT)) return SCPE_UNATT; buf_f = (uint8 *)calloc (1, max); if (buf_f == NULL) return SCPE_MEM; buf_r = (uint8 *)calloc (1, max); if (buf_r == NULL) { free (buf_f); return SCPE_MEM; } rec_sizes = (uint32 *)calloc (max + 1, sizeof (*rec_sizes)); if (rec_sizes == NULL) { free (buf_f); free (buf_r); return SCPE_MEM; } r = sim_tape_rewind (uptr); while (r == SCPE_OK) { if (stop_cpu) /* SIGINT? */ break; pos_f = uptr->pos; r_f = sim_tape_rdrecf (uptr, buf_f, &bc_f, max); switch (r_f) { case MTSE_OK: /* no error */ case MTSE_TMK: /* tape mark */ if (r_f == MTSE_OK) ++record_total; else ++tapemark_total; data_total += bc_f; if (bc_f != 0) { if (rec_sizes[bc_f] == 0) ++unique_record_sizes; ++rec_sizes[bc_f]; } r_r = sim_tape_rdrecr (uptr, buf_r, &bc_r, max); pos_r = uptr->pos; if (r_r != r_f) { sim_printf ("Forward Record Read returned: %s, Reverse read returned: %s\n", sim_tape_error_text (r_f), sim_tape_error_text (r_r)); break; } if (bc_f != bc_r) { sim_printf ("Forward Record Read record length: %d, Reverse read record length: %d\n", bc_f, bc_r); break; } if (0 != memcmp (buf_f, buf_r, bc_f)) { sim_printf ("%d byte record contents differ when read forward amd backwards start from position %" T_ADDR_FMT "u\n", bc_f, pos_f); break; } memset (buf_f, 0, bc_f); memset (buf_r, 0, bc_f); if (pos_f != pos_r) { sim_printf ("Unexpected tape file position between forward and reverse record read: (%" T_ADDR_FMT "u, %" T_ADDR_FMT "u\n", pos_f, pos_r); break; } r_s = sim_tape_sprecf (uptr, &bc_s); if (r_s != r_f) { sim_printf ("Unexpected Space Record Status: %s vs %s\n", sim_tape_error_text (r_s), sim_tape_error_text (r_f)); break; } if (bc_s != bc_f) { sim_printf ("Unexpected Space Record Length: %d vs %d\n", bc_s, bc_f); break; } r = SCPE_OK; break; case MTSE_INVRL: /* invalid rec lnt */ case MTSE_FMT: /* invalid format */ case MTSE_BOT: /* beginning of tape */ case MTSE_RECE: /* error in record */ case MTSE_WRP: /* write protected */ case MTSE_LEOT: /* Logical End Of Tape */ case MTSE_RUNAWAY: /* tape runaway */ default: r = r_f; break; case MTSE_EOM: /* end of medium */ r = r_f; break; } } uptr->tape_eom = uptr->pos; if ((!stop_cpu) && ((r != MTSE_EOM) || (sim_switches & SWMASK ('V')) || (sim_switches & SWMASK ('L')) || ((uint32)(sim_fsize_ex (uptr->fileref) - (t_offset)uptr->pos) > fmts[MT_GET_FMT (uptr)].eom_remnant) || (unique_record_sizes > 2 * tapemark_total))) { remaining_data = (uint32)(sim_fsize_ex (uptr->fileref) - (t_offset)uptr->tape_eom); sim_printf ("Tape Image '%s' scanned as %s format.\n", uptr->filename, fmts[MT_GET_FMT (uptr)].name); if (r != MTSE_EOM) sim_printf ("After processing "); else sim_printf ("contains "); sim_printf ("%u bytes of tape data (%u records, %u tapemarks)\n", data_total, record_total, tapemark_total); if ((record_total > 0) && (sim_switches & SWMASK ('L'))) { sim_printf ("Comprising %d different sized records (in record size order):\n", unique_record_sizes); for (bc = 0; bc <= max; bc++) { if (rec_sizes[bc]) sim_printf ("%8u %u byte records\n", rec_sizes[bc], (uint32)bc); } } if (r != MTSE_EOM) sim_printf ("Read Tape Record Returned Unexpected Status: %s\n", sim_tape_error_text (r)); if (remaining_data > fmts[MT_GET_FMT (uptr)].eom_remnant) sim_printf ("%u bytes of unexamined data remain in the tape image file\n", remaining_data); } if ((!stop_cpu) && (unique_record_sizes > 2 * tapemark_total)) { sim_printf ("An unreasonable number of record sizes(%u) vs tape marks (%u) have been found\n", unique_record_sizes, tapemark_total); sim_printf ("The tape format (%s) might not be correct for the '%s' tape image\n", fmts[MT_GET_FMT (uptr)].name, uptr->filename); } free (buf_f); free (buf_r); free (rec_sizes); uptr->pos = saved_pos; (void)sim_fseek (uptr->fileref, uptr->pos, SEEK_SET); return SCPE_OK; } /* Find the preceding record in a TPC file */ static t_addr sim_tape_tpc_fnd (UNIT *uptr, t_addr *map) { |
︙ | ︙ | |||
3397 3398 3399 3400 3401 3402 3403 3404 3405 3406 3407 3408 3409 3410 | (void)sim_fwrite (&awsrec_typ, sizeof (awsrec_typ), 1, fAWS); mtrlnt = 0xffffffff; tpclnt = 0xffff; (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fSIMH); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fE11); (void)sim_fwrite (&tpclnt, sizeof (tpclnt), 1, fTPC); (void)sim_fwrite (buf, 1, 1, fP7B); for (j=0; j<records; j++) { memset (buf, j, 10240); (void)sim_fwrite (buf, 1, 10240, fTAR); (void)sim_fwrite (buf, 1, 10240, fTAR2); } memset (buf, j, 10240); (void)sim_fwrite (buf, 1, 5120, fTAR2); | > > > > > > > > > > > | 3419 3420 3421 3422 3423 3424 3425 3426 3427 3428 3429 3430 3431 3432 3433 3434 3435 3436 3437 3438 3439 3440 3441 3442 3443 | (void)sim_fwrite (&awsrec_typ, sizeof (awsrec_typ), 1, fAWS); mtrlnt = 0xffffffff; tpclnt = 0xffff; (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fSIMH); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fE11); (void)sim_fwrite (&tpclnt, sizeof (tpclnt), 1, fTPC); (void)sim_fwrite (buf, 1, 1, fP7B); /* Write an unmatched record delimiter (aka garbage) at the end of the SIMH, E11 and AWS files */ mtrlnt = 25; (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fSIMH); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fE11); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fAWS); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fAWS); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, fAWS); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, uptr->fileref); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, uptr->fileref); (void)sim_fwrite (&mtrlnt, sizeof (mtrlnt), 1, uptr->fileref); for (j=0; j<records; j++) { memset (buf, j, 10240); (void)sim_fwrite (buf, 1, 10240, fTAR); (void)sim_fwrite (buf, 1, 10240, fTAR2); } memset (buf, j, 10240); (void)sim_fwrite (buf, 1, 5120, fTAR2); |
︙ | ︙ | |||
3441 3442 3443 3444 3445 3446 3447 | static t_stat sim_tape_test_process_tape_file (UNIT *uptr, const char *filename, const char *format) { char args[256]; t_stat stat; sprintf (args, "%s %s.%s", format, filename, format); sim_tape_detach (uptr); | | | 3474 3475 3476 3477 3478 3479 3480 3481 3482 3483 3484 3485 3486 3487 3488 | static t_stat sim_tape_test_process_tape_file (UNIT *uptr, const char *filename, const char *format) { char args[256]; t_stat stat; sprintf (args, "%s %s.%s", format, filename, format); sim_tape_detach (uptr); sim_switches |= SWMASK ('F') | SWMASK ('L'); /* specific-format and detailed record report */ stat = sim_tape_attach_ex (uptr, args, 0, 0); if (stat != SCPE_OK) return stat; sim_tape_detach (uptr); sim_switches = 0; return SCPE_OK; } |
︙ | ︙ |
Changes to src/misc/scanswitch.c.
︙ | ︙ | |||
40 41 42 43 44 45 46 | int main() { int i,j,k,switchscan[2], tmp; extern struct bcm2835_peripheral gpio; if (map_gpio_for_pidp8i (1) != 0) { printf("Failed to map the GPIO SoC peripheral into our VM space.\n"); | | | 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | int main() { int i,j,k,switchscan[2], tmp; extern struct bcm2835_peripheral gpio; if (map_gpio_for_pidp8i (1) != 0) { printf("Failed to map the GPIO SoC peripheral into our VM space.\n"); return 127; } init_pidp8i_gpio(); // Read the switches for (uint8_t row=1;row<=2;row++) // do rows 2 (for IF switches) and 3 (for STOP switch) { INP_GPIO(rows[row]); |
︙ | ︙ |
Changes to src/pidp8i/gpio-common.c.in.
︙ | ︙ | |||
157 158 159 160 161 162 163 | int resumeFromInstructionLoopExit = 0; // SCP's signal handlers, which we extend. #if !defined(HAVE_SIGHANDLER_T) && defined(HAVE_SIG_T) typedef sig_t sighandler_t; #endif | | | 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 | int resumeFromInstructionLoopExit = 0; // SCP's signal handlers, which we extend. #if !defined(HAVE_SIGHANDLER_T) && defined(HAVE_SIG_T) typedef sig_t sighandler_t; #endif static sighandler_t scp_term_handler = 0; //// MEMORY MAPPED GPIO FUNCTIONS ////////////////////////////////////// //// map_peripheral //////////////////////////////////////////////////// // Exposes the physical address defined in the passed structure |
︙ | ︙ | |||
724 725 726 727 728 729 730 | gpio2.addr[0x0B] = (gpio2.addr[0x0B] & 0xF7) | (0x5A << 24); #endif return 0; } | | | | | < < < < < | | < < < | | < | | > | 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 | gpio2.addr[0x0B] = (gpio2.addr[0x0B] & 0xF7) | (0x5A << 24); #endif return 0; } //// pidp8i_term_handler /////////////////////////////////////////////// // Handle SIGTERM by shutting down our GPIO thread, then pass it on to // SCP's handler, if one is registered. // // We don't do this with SIGINT instead because that's basically an // alias for SCP's Ctrl-E handler. We don't want to do this every time // someone pulls up the SCP command console. static void pidp8i_term_handler (int sig) { if (scp_term_handler) scp_term_handler (sig); if (pidp8i_gpio_present) { turn_off_pidp8i_leds (); stop_pidp8i_gpio_thread (); } } //// start/stop_pidp8i_gpio_thread ///////////////////////////////////// // Start and stop gpio_thread(). We export these functions rather than // export gpio_thread() directly so this module's users don't have to |
︙ | ︙ | |||
796 797 798 799 800 801 802 | int errlen = snprintf (errs, sizeof(errs), "Cannot run the %s " "while another PiDP-8/I program runs.\r\n", must_map); if (errlen > 0 && errlen < sizeof(errs)) write (2, errs, errlen); pcerr = EACCES; } else { // Shut the GPIO thread down gracefully on fatal signals. | | | 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 | int errlen = snprintf (errs, sizeof(errs), "Cannot run the %s " "while another PiDP-8/I program runs.\r\n", must_map); if (errlen > 0 && errlen < sizeof(errs)) write (2, errs, errlen); pcerr = EACCES; } else { // Shut the GPIO thread down gracefully on fatal signals. scp_term_handler = signal (SIGTERM, pidp8i_term_handler); // Don't return until GPIO thread is sufficiently initted. // // There are two possible sequences: // // 1. We get here before the GPIO thread gets to its "unlock" // call, so our back-to-back locks in this thread stall this |
︙ | ︙ |
Changes to tools/autosetup-update.
1 | #!/bin/bash | > | | | 1 2 3 4 5 6 | #!/bin/bash srcdir=`pwd` ( cd ~/src/autosetup/master && git pull > /dev/null && ./autosetup --install=$srcdir ) || exit 1 chmod -x $(fossil status --meta autosetup | grep ^EXEC | cut -c8-) auto.def fossil rm --hard $(fossil status --missing autosetup | grep ^MISS | cut -c8-) fossil add autosetup/* |
Changes to tools/bosi.
︙ | ︙ | |||
85 86 87 88 89 90 91 | exit 1 fi set -x apt-get update && apt-get -y upgrade || true | | | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 | exit 1 fi set -x apt-get update && apt-get -y upgrade || true apt-get -y install python-pip || true pip install pexpect test -f /usr/include/curses.h || apt-get -y install libncurses-dev if [ -z "$(type -p fossil)" ] then fb=/usr/local/bin/fossil |
︙ | ︙ | |||
137 138 139 140 141 142 143 144 145 146 147 148 149 150 | if [ -r ChangeLog.md ] then fossil revert # just in case fossil update release else fossil open ~/museum/$repo.fossil release ./configure fi tools/mmake bin/teco-pi-demo -b # test and benchmark simulator sudo make install || true # don't care about return code do_wait "Rebooting" | > | 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 | if [ -r ChangeLog.md ] then fossil revert # just in case fossil update release else fossil open ~/museum/$repo.fossil release fossil set autosync pullonly ./configure fi tools/mmake bin/teco-pi-demo -b # test and benchmark simulator sudo make install || true # don't care about return code do_wait "Rebooting" |
︙ | ︙ |
Changes to tools/mkrel.
1 2 3 4 5 6 | #!/bin/bash ######################################################################## # mkrel - Automatically merge trunk changes into the release branch # for a new public release of the software. Also tags the trunk with # the date of release, so old releases can be easily checked out. # | | | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 | #!/bin/bash ######################################################################## # mkrel - Automatically merge trunk changes into the release branch # for a new public release of the software. Also tags the trunk with # the date of release, so old releases can be easily checked out. # # Copyright © 2016-2019 Warren Young # # Permission is hereby granted, free of charge, to any person obtaining # a copy of this software and associated documentation files (the # "Software"), to deal in the Software without restriction, including # without limitation the rights to use, copy, modify, merge, publish, # distribute, sublicense, and/or sell copies of the Software, and to # permit persons to whom the Software is furnished to do so, subject to |
︙ | ︙ | |||
28 29 30 31 32 33 34 35 36 | # Except as contained in this notice, the names of the authors above # shall not be used in advertising or otherwise to promote the sale, # use or other dealings in this Software without prior written # authorization from those authors. ######################################################################## set -e tag=v$(date +%Y%m%d) | > | < > | | < > | | | 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 | # Except as contained in this notice, the names of the authors above # shall not be used in advertising or otherwise to promote the sale, # use or other dealings in this Software without prior written # authorization from those authors. ######################################################################## set -e alias f=fossil tag=v$(date +%Y%m%d) f update && ( test -z "$(f changes --no-classify)" || f ci -m "Released $tag" ) && cd ../release && f update && f merge trunk && test -z "$(f changes --conflict)" && tools/mmake && f diff -w --tk && f ci --tag $tag -m "Merged trunk changes for $tag into release branch" |
Changes to tools/publish-os8.
1 2 | #!/bin/sh -e cd bin | | | 1 2 3 4 | #!/bin/sh -e cd bin fossil uv add v3d*.rk05 fossil uv sync |