From b5b8277611f008cc26296741e2c40eee2758340d Mon Sep 17 00:00:00 2001 From: "Howard M. Harte" Date: Sat, 8 Oct 2022 13:40:53 -0700 Subject: [PATCH] TX-0: Reconcile license with open-simh. --- TX-0/tx0_cpu.c | 24 ++++++++++-------------- TX-0/tx0_defs.h | 32 ++++++++++++++------------------ TX-0/tx0_dpy.c | 24 +++++++++++------------- TX-0/tx0_stddev.c | 24 ++++++++++-------------- TX-0/tx0_sys.c | 26 +++++++++++--------------- TX-0/tx0_sys_orig.c | 25 +++++++++++-------------- 6 files changed, 67 insertions(+), 88 deletions(-) diff --git a/TX-0/tx0_cpu.c b/TX-0/tx0_cpu.c index a7d07967..12aef9f0 100644 --- a/TX-0/tx0_cpu.c +++ b/TX-0/tx0_cpu.c @@ -1,9 +1,7 @@ /************************************************************************* * * - * $Id: tx0_cpu.c 2066 2009-02-27 15:57:22Z hharte $ * - * * - * Copyright (c) 2009-2017 Howard M. Harte. * - * Based on pdp1_cpu.c, Copyright (c) 1993-2007, Robert M. Supnik * + * Copyright (c) 2009-2022 Howard M. Harte. * + * https://github.com/hharte * * * * Permission is hereby granted, free of charge, to any person obtaining * * a copy of this software and associated documentation files (the * @@ -18,23 +16,21 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * * TX-0 Central Processor * * * - * Environment: * - * User mode only * - * * * References: * * See: www.bitsavers.org/pdf/mit/tx-0/ for documentation. * * See: www.bitsavers.org/bits/MIT/tx-0/ for software. * diff --git a/TX-0/tx0_defs.h b/TX-0/tx0_defs.h index 687b4df3..4939d2cc 100644 --- a/TX-0/tx0_defs.h +++ b/TX-0/tx0_defs.h @@ -1,9 +1,7 @@ /************************************************************************* * * - * $Id: tx0_defs.h 2059 2009-02-23 05:59:14Z hharte $ * - * * - * Copyright (c) 2009 Howard M. Harte. * - * Based on pdp1_defs.h, Copyright (c) 1993-2006, Robert M. Supnik * + * Copyright (c) 2009-2022 Howard M. Harte. * + * https://github.com/hharte * * * * Permission is hereby granted, free of charge, to any person obtaining * * a copy of this software and associated documentation files (the * @@ -18,27 +16,25 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * - * cpu TX-0 Central Processor * - * * - * Environment: * - * User mode only * + * cpu TX-0 Central Processor Definitions. * * * *************************************************************************/ -#ifndef PDP1_DEFS_H_ -#define PDP1_DEFS_H_ 0 +#ifndef TX0_DEFS_H_ +#define TX0_DEFS_H_ 0 #include "sim_defs.h" @@ -94,4 +90,4 @@ #define UNIT_MODE_TEST (1 << UNIT_V_MODE) -#endif +#endif /* TX0_DEFS_H_ */ diff --git a/TX-0/tx0_dpy.c b/TX-0/tx0_dpy.c index 6ace879b..9c3a47d6 100644 --- a/TX-0/tx0_dpy.c +++ b/TX-0/tx0_dpy.c @@ -1,8 +1,7 @@ /************************************************************************* * * - * $Id: tx0_dpy.c 2060 2009-02-24 06:49:07Z hharte $ * - * * - * Copyright (c) 2009-2012, Howard M. Harte * + * Copyright (c) 2009-2022, Howard M. Harte * + * https://github.com/hharte * * Copyright (c) 2004, Philip L. Budne * * Copyright (c) 1993-2003, Robert M. Supnik * * * @@ -19,22 +18,21 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * - * TX-0 display simulator * * * - * Environment: * - * User mode only * + * TX-0 display simulator * * * *************************************************************************/ diff --git a/TX-0/tx0_stddev.c b/TX-0/tx0_stddev.c index 9a969e09..91e76264 100644 --- a/TX-0/tx0_stddev.c +++ b/TX-0/tx0_stddev.c @@ -1,9 +1,7 @@ /************************************************************************* * * - * $Id: tx0_stddev.c 2063 2009-02-25 07:37:57Z hharte $ * - * * - * Copyright (c) 2009-2012 Howard M. Harte. * - * Based on pdp1_stddev.c, Copyright (c) 1993-2006, Robert M. Supnik * + * Copyright (c) 2009-2022 Howard M. Harte. * + * https://github.com/hharte * * * * Permission is hereby granted, free of charge, to any person obtaining * * a copy of this software and associated documentation files (the * @@ -18,23 +16,21 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * * TX-0 Standard Devices * * * - * Environment: * - * User mode only * - * * *************************************************************************/ /* diff --git a/TX-0/tx0_sys.c b/TX-0/tx0_sys.c index 823ca7f0..cedae5a2 100644 --- a/TX-0/tx0_sys.c +++ b/TX-0/tx0_sys.c @@ -1,9 +1,7 @@ /************************************************************************* * * - * $Id: tx0_sys.c 2061 2009-02-24 07:05:58Z hharte $ * - * * - * Copyright (c) 2009-2012 Howard M. Harte. * - * Based on pdp1_sys.c, Copyright (c) 1993-2007, Robert M. Supnik * + * Copyright (c) 2009-2022 Howard M. Harte. * + * https://github.com/hharte * * * * Permission is hereby granted, free of charge, to any person obtaining * * a copy of this software and associated documentation files (the * @@ -18,22 +16,20 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * - * TX-0 simulator interface * - * * - * Environment: * - * User mode only * + * TX-0 simulator interface: 4-bit opcode with index register. * * * *************************************************************************/ diff --git a/TX-0/tx0_sys_orig.c b/TX-0/tx0_sys_orig.c index 8f526711..c2d90c28 100644 --- a/TX-0/tx0_sys_orig.c +++ b/TX-0/tx0_sys_orig.c @@ -1,8 +1,7 @@ /************************************************************************* * * - * $Id: tx0_sys_orig.c 2065 2009-02-25 15:05:00Z hharte $ * - * * - * Copyright (c) 2009-2012 Howard M. Harte. * + * Copyright (c) 2009-2022 Howard M. Harte. * + * https://github.com/hharte * * * * Permission is hereby granted, free of charge, to any person obtaining * * a copy of this software and associated documentation files (the * @@ -17,22 +16,20 @@ * * * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, * * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF * - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND * - * NONINFRINGEMENT. IN NO EVENT SHALL HOWARD M. HARTE BE LIABLE FOR ANY * - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, * - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE * - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. * + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON- * + * INFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE * + * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN * + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN * + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE * + * SOFTWARE. * * * - * Except as contained in this notice, the name of Howard M. Harte shall * + * Except as contained in this notice, the names of The Authors shall * * not be used in advertising or otherwise to promote the sale, use or * * other dealings in this Software without prior written authorization * - * of Howard M. Harte. * + * from the Authors. * * * * Module Description: * - * TX-0 simulator interface * - * * - * Environment: * - * User mode only * + * Original Lincoln Labs TX-0: 2-bit opcode and no index register. * * * *************************************************************************/