f4a6da2e52
This is the second of a series of changes related to save/restore.
No EDITLEVEL bump has been included, because although the code
is changed extensively by this, the content of the savefiles have
not been changed.
Push the use of the structlevel bwrite() and mread() function use
out of the core and into sfstruct.c. This is groundwork for upcoming
changes.
In the core, replace the bwrite() and mread() calls with the
use of type-specific savefile output (Sfo) and savefile
input (Sfi) macros. The macros are defined in a new header file
savefile.h, which also contains the prototypes for the sfo_* and
sfi_* functions that the macros ultimately expand to. The functions
themselves are in src/sfbase.c.
On C99, each Sfo or Sfi macro expansion refers directly to the
corresponding type-specific sfo_* or sfi_* function.
If C23 or later is is use, the majority (all but 3 types) of the
macros refer to a single _Generic output routine sfo(nhfp, dt, tag),
and a single _Generic input routine sfi(nhfp, dt, tag), which handles
the dispatch of the type-specific underlying functions. This was
somewhat experimental, but turned out to be practical because the
compiler would gripe if the type for a variable was not included in
the _Generic when passed as an argument, so it could be fixed.
This alters the savefile verication process by having a common set
return values for the related functions such as uptodate(),
check_version(), etc. The new return values return more information
about savefile incompatibilities, beyond failure/sucess. The
additional information will be useful for an upcoming addition.
The expanded return values are:
SF_UPTODATE (0) everything matched and looks good
SF_OUTDATED (1) savefile is outdated
SF_CRITICAL_BYTE_COUNT_MISMATCH (2) critical size count mismatch
SF_DM_IL32LLP64_ON_ILP32LL64 (3) Windows x64 savefile on x86
SF_DM_I32LP64_ON_ILP32LL64 (4) Unix 64 savefile on x86
SF_DM_ILP32LL64_ON_I32LP64 (5) x86 savefile on Unix 64
SF_DM_ILP32LL64_ON_IL32LLP64 (6) x86 savefile on Windows x64
SF_DM_I32LP64_ON_IL32LLP64 (7) Unix 64 savefile on Windows x64
SF_DM_IL32LLP64_ON_I32LP64 (8) Windows x64 savefile on Unix 64
SF_DM_MISMATCH (9) some other mismatch
The callers in the core have been adjusted to deal with the expanded
return values.
Other miscellaneous inclusions:
- go.oracle_loc -> svo.oracle_loc.
- add a bit (1UL << 30) to called SFCTOOL_BIT as groundwork
for changes to follow.
99 lines
1.3 KiB
Plaintext
99 lines
1.3 KiB
Plaintext
# CVS default ignores begin
|
|
tags
|
|
TAGS
|
|
.make.state
|
|
.nse_depinfo
|
|
*~
|
|
\#*
|
|
.#*
|
|
,*
|
|
_$*
|
|
*$
|
|
*.old
|
|
*.bak
|
|
*.BAK
|
|
*.orig
|
|
*.rej
|
|
.del-*
|
|
*.a
|
|
*.olb
|
|
*.o
|
|
*.obj
|
|
*.so
|
|
*.exe
|
|
*.Z
|
|
*.elc
|
|
*.ln
|
|
core
|
|
# CVS default ignores end
|
|
.*.swp
|
|
|
|
# We generate makefiles by shell script
|
|
Makefile
|
|
|
|
# Win32-specific ignores
|
|
Debug/
|
|
Release/
|
|
binary/
|
|
package/*
|
|
vspackage/
|
|
vsbinary/
|
|
build/
|
|
ipch/
|
|
lib/*
|
|
Nethack.sln
|
|
Nethack.sdf
|
|
Nethack.opensdf
|
|
Makefile.bcc
|
|
Makefile.gcc
|
|
Makefile-orig
|
|
Makefile.bcc-orig
|
|
Makefile.gcc-orig
|
|
*.suo
|
|
*.pdb
|
|
*.ilk
|
|
# VS2013 extension to auto-whine about questionable code generates these
|
|
*.lastcodeanalysissucceeded
|
|
# VS 2017 caches data into the hidden directory .vs
|
|
.vs
|
|
win/win32/vs/obj/*
|
|
# Win32-specific ignores end
|
|
.DS_Store
|
|
# ms-dos
|
|
# resulting zip
|
|
NH*DOS.ZIP
|
|
# 8.3 versions
|
|
dat/data.bas
|
|
sys/share/posixreg.c
|
|
include/patchlev.h
|
|
doc/guidebk.txt
|
|
# folders compiler, target objs, binary results
|
|
djgpp/
|
|
src/msdos_o/
|
|
msdos-binary/
|
|
dat/NHTILES.BMP
|
|
dat/msdoshlp.txt
|
|
src/host_o/
|
|
util/djgpp-linux64-gcc550.tar.bz2
|
|
util/djgpp-osx-gcc550.tar.bz2
|
|
util/djgpp-mingw-gcc550-standalone.zip
|
|
util/dlb_main
|
|
util/thintile
|
|
util/til2bin2
|
|
util/tile2bin
|
|
win/share/monthin.txt
|
|
win/share/objthin.txt
|
|
win/share/oththin.txt
|
|
# end of ms-dos
|
|
|
|
#libnethack
|
|
targets/*
|
|
bundle/*
|
|
#test.js
|
|
#sys/lib/npm-package/build/nethack.js
|
|
#sys/lib/npm-package/build/nethack.wasm
|
|
*.user
|
|
util/*.lib
|
|
util/*.exp
|
|
submodules/CHKSUMS.tmp
|