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

HP2100: Change hp_disclib filename to hp2100_disclib (from Dave Bryan)

Browse source
This commit is contained in:
Mark Pizzolato 2016-03-07 20:42:19 -08:00
parent 71e745b0c8
commit 53b6809e4a
9 changed files with 46 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
HP2100/hp2100_bugfixes.txt
View file

@ -1,6 +1,6 @@
HP 2100 SIMULATOR BUG FIX WRITEUPS HP 2100 SIMULATOR BUG FIX WRITEUPS
================================== ==================================
Last update: 2015-11-24 Last update: 2016-03-04
1. PROBLEM: Booting from magnetic tape reports "HALT instruction, P: 77756 1. PROBLEM: Booting from magnetic tape reports "HALT instruction, P: 77756
@ -6911,3 +6911,28 @@
respectively. respectively.
STATUS: Fixed in version 4.0-0. STATUS: Fixed in version 4.0-0.
270. PROBLEM: The disc libraries in the HP2100 and HP3000 directories differ.
VERSION: 4.0-0
OBSERVATION: The "hp_disclib.c" and "hp_disclib.h" files appear in both
the HP2100 and HP3000 subdirectories. However, the contents of the files
are different. If both source sets are compiled to a common object
subdirectory, one of the two executables will not link, due to unresolved
externals.
CAUSE: The disc library in the HP3000 subdirectory is an extension of the
one in the HP2100 subdirectory. It is intended as an eventual replacement
for the HP2100 version, so that both simulators can share the library.
Until then, however, they are not interchangeable, as they export different
routines, leading to link errors if one is accidentally substituted for the
other.
RESOLUTION: Rename "hp_disclib.c/h" in the HP2100 subdirectory to
"hp2100_disclib.c/h" to indicate that it is HP2100-specific. Alter
"hp2100_ds.c" and "hp2100_di_da.c" to use the new include file name.
STATUS: Fixed in version 4.0-0.

5
HP2100/hp2100_di_da.c
View file

@ -1,6 +1,6 @@
/* hp2100_di_da.c: HP 12821A HP-IB Disc Interface simulator for Amigo disc drives /* hp2100_di_da.c: HP 12821A HP-IB Disc Interface simulator for Amigo disc drives
Copyright (c) 2011-2014, J. David Bryan Copyright (c) 2011-2016, J. David Bryan
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -25,6 +25,7 @@
DA 12821A Disc Interface with Amigo disc drives DA 12821A Disc Interface with Amigo disc drives
04-Mar-16 JDB Name changed to "hp2100_disclib" until HP 3000 integration
30-Dec-14 JDB Added S-register parameters to ibl_copy 30-Dec-14 JDB Added S-register parameters to ibl_copy
24-Dec-14 JDB Use T_ADDR_FMT with t_addr values for 64-bit compatibility 24-Dec-14 JDB Use T_ADDR_FMT with t_addr values for 64-bit compatibility
Removed redundant global declarations Removed redundant global declarations
@ -339,7 +340,7 @@
#include "hp2100_defs.h" #include "hp2100_defs.h"
#include "hp2100_di.h" #include "hp2100_di.h"
#include "hp_disclib.h" #include "hp2100_disclib.h"

7
HP2100/hp_disclib.c → HP2100/hp2100_disclib.c
View file

@ -1,6 +1,6 @@
/* hp_disclib.c: HP MAC/ICD disc controller simulator library /* hp2100_disclib.c: HP MAC/ICD disc controller simulator library
Copyright (c) 2011-2014, J. David Bryan Copyright (c) 2011-2016, J. David Bryan
Copyright (c) 2004-2011, Robert M. Supnik Copyright (c) 2004-2011, Robert M. Supnik
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
@ -24,6 +24,7 @@
used in advertising or otherwise to promote the sale, use or other dealings used in advertising or otherwise to promote the sale, use or other dealings
in this Software without prior written authorization from the authors. in this Software without prior written authorization from the authors.
04-Mar-16 JDB Name changed to "hp2100_disclib" until HP 3000 integration
24-Dec-14 JDB Added casts for explicit downward conversions 24-Dec-14 JDB Added casts for explicit downward conversions
27-Oct-14 JDB Corrected the relative movement calculation in start_seek 27-Oct-14 JDB Corrected the relative movement calculation in start_seek
20-Dec-12 JDB sim_is_active() now returns t_bool 20-Dec-12 JDB sim_is_active() now returns t_bool
@ -254,7 +255,7 @@
#include <math.h> #include <math.h>
#include "hp_disclib.h" #include "hp2100_disclib.h"

0
HP2100/hp_disclib.h → HP2100/hp2100_disclib.h
View file

5
HP2100/hp2100_ds.c
View file

@ -1,7 +1,7 @@
/* hp2100_ds.c: HP 13037D/13175D disc controller/interface simulator /* hp2100_ds.c: HP 13037D/13175D disc controller/interface simulator
Copyright (c) 2004-2012, Robert M. Supnik Copyright (c) 2004-2012, Robert M. Supnik
Copyright (c) 2012-2014 J. David Bryan Copyright (c) 2012-2016 J. David Bryan
Permission is hereby granted, free of charge, to any person obtaining a Permission is hereby granted, free of charge, to any person obtaining a
copy of this software and associated documentation files (the "Software"), copy of this software and associated documentation files (the "Software"),
@ -26,6 +26,7 @@
DS 13037D/13175D disc controller/interface DS 13037D/13175D disc controller/interface
04-Mar-16 JDB Name changed to "hp2100_disclib" until HP 3000 integration
30-Dec-14 JDB Added S-register parameters to ibl_copy 30-Dec-14 JDB Added S-register parameters to ibl_copy
24-Dec-14 JDB Use T_ADDR_FMT with t_addr values for 64-bit compatibility 24-Dec-14 JDB Use T_ADDR_FMT with t_addr values for 64-bit compatibility
18-Mar-13 JDB Fixed poll_drives definition to match declaration 18-Mar-13 JDB Fixed poll_drives definition to match declaration
@ -120,7 +121,7 @@
#include "hp2100_defs.h" #include "hp2100_defs.h"
#include "hp_disclib.h" #include "hp2100_disclib.h"

16
Visual Studio Projects/HP2100.vcproj
View file

@ -236,6 +236,10 @@
RelativePath="..\HP2100\hp2100_di_da.c" RelativePath="..\HP2100\hp2100_di_da.c"
> >
</File> </File>
<File
RelativePath="..\HP2100\hp2100_disclib.c"
>
</File>
<File <File
RelativePath="..\HP2100\hp2100_dp.c" RelativePath="..\HP2100\hp2100_dp.c"
> >
@ -300,10 +304,6 @@
RelativePath="..\HP2100\hp2100_sys.c" RelativePath="..\HP2100\hp2100_sys.c"
> >
</File> </File>
<File
RelativePath="..\HP2100\hp_disclib.c"
>
</File>
<File <File
RelativePath="..\scp.c" RelativePath="..\scp.c"
> >
@ -369,6 +369,10 @@
RelativePath="..\HP2100\hp2100_di.h" RelativePath="..\HP2100\hp2100_di.h"
> >
</File> </File>
<File
RelativePath="..\HP2100\hp2100_disclib.h"
>
</File>
<File <File
RelativePath="..\HP2100\hp2100_fp.h" RelativePath="..\HP2100\hp2100_fp.h"
> >
@ -377,10 +381,6 @@
RelativePath="..\HP2100\hp2100_fp1.h" RelativePath="..\HP2100\hp2100_fp1.h"
> >
</File> </File>
<File
RelativePath="..\HP2100\hp_disclib.h"
>
</File>
<File <File
RelativePath="..\scp.h" RelativePath="..\scp.h"
> >

2
descrip.mms
View file

@ -415,7 +415,7 @@ HP2100_LIB2 = $(LIB_DIR)HP2100L2-$(ARCH).OLB
HP2100_SOURCE2 = $(HP2100_DIR)HP2100_FP1.C,$(HP2100_DIR)HP2100_BACI.C,\ HP2100_SOURCE2 = $(HP2100_DIR)HP2100_FP1.C,$(HP2100_DIR)HP2100_BACI.C,\
$(HP2100_DIR)HP2100_MPX.C,$(HP2100_DIR)HP2100_PIF.C,\ $(HP2100_DIR)HP2100_MPX.C,$(HP2100_DIR)HP2100_PIF.C,\
$(HP2100_DIR)HP2100_DI.C,$(HP2100_DIR)HP2100_DI_DA.C,\ $(HP2100_DIR)HP2100_DI.C,$(HP2100_DIR)HP2100_DI_DA.C,\
$(HP2100_DIR)HP_DISCLIB.C $(HP2100_DIR)HP2100_DISCLIB.C
.IFDEF ALPHA_OR_IA64 .IFDEF ALPHA_OR_IA64
HP2100_OPTIONS = /INCL=($(SIMH_DIR),$(HP2100_DIR))\ HP2100_OPTIONS = /INCL=($(SIMH_DIR),$(HP2100_DIR))\
/DEF=($(CC_DEFS),"HAVE_INT64=1") /DEF=($(CC_DEFS),"HAVE_INT64=1")

BIN
doc/hp2100_doc.doc
View file

Binary file not shown.

2
makefile
View file

@ -1098,7 +1098,7 @@ HP2100 = ${HP2100D}/hp2100_stddev.c ${HP2100D}/hp2100_dp.c ${HP2100D}/hp2100_dq.
${HP2100D}/hp2100_cpu4.c ${HP2100D}/hp2100_cpu5.c ${HP2100D}/hp2100_cpu6.c \ ${HP2100D}/hp2100_cpu4.c ${HP2100D}/hp2100_cpu5.c ${HP2100D}/hp2100_cpu6.c \
${HP2100D}/hp2100_cpu7.c ${HP2100D}/hp2100_fp1.c ${HP2100D}/hp2100_baci.c \ ${HP2100D}/hp2100_cpu7.c ${HP2100D}/hp2100_fp1.c ${HP2100D}/hp2100_baci.c \
${HP2100D}/hp2100_mpx.c ${HP2100D}/hp2100_pif.c ${HP2100D}/hp2100_di.c \ ${HP2100D}/hp2100_mpx.c ${HP2100D}/hp2100_pif.c ${HP2100D}/hp2100_di.c \
${HP2100D}/hp2100_di_da.c ${HP2100D}/hp_disclib.c ${HP2100D}/hp2100_di_da.c ${HP2100D}/hp2100_disclib.c
HP2100_OPT = -DHAVE_INT64 -I ${HP2100D} HP2100_OPT = -DHAVE_INT64 -I ${HP2100D}