diff --git a/.github/workflows/commit.yml b/.github/workflows/commit.yml index ccc9daae..60aa0bc1 100644 --- a/.github/workflows/commit.yml +++ b/.github/workflows/commit.yml @@ -22,6 +22,7 @@ jobs: run: | export TZ='America/Los_Angeles' sudo apt-get install libncurses-dev + sudo apt-get install srecord make make clean rm -rf .git* @@ -47,6 +48,7 @@ jobs: - name: Build run: | export TZ='America/Los_Angeles' + brew install srecord make make clean rm -rf .git* diff --git a/.gitignore b/.gitignore index e9b8986e..5c5aea86 100644 --- a/.gitignore +++ b/.gitignore @@ -91,6 +91,7 @@ Tools/unix/zx/zx !Source/ZPM3/*.[Cc][Oo][Mm] !Source/ZSDOS/*.[Cc][Oo][Mm] !Source/ZRC/*.bin +!Source/ZZR/*.bin !Tools/cpm/bin !Tools/unix/zx !Tools/zx diff --git a/Binary/Clean.cmd b/Binary/Clean.cmd index c00ca43e..b9ac0ac5 100644 --- a/Binary/Clean.cmd +++ b/Binary/Clean.cmd @@ -6,6 +6,7 @@ if exist *.dat del *.dat if exist *.com del *.com if exist *.img del *.img if exist *.rom del *.rom +if exist *.hex del *.hex if exist *.upd del *.upd if exist *.pdf del *.pdf if exist *.eeprom del *.eeprom diff --git a/Binary/Makefile b/Binary/Makefile index 4b2e6294..c5a288e1 100644 --- a/Binary/Makefile +++ b/Binary/Makefile @@ -5,4 +5,4 @@ SUBDIRS = Apps CPM3 ZPM3 include $(TOOLS)/Makefile.inc clobber:: - @rm -f *.bin *.com *.img *.rom *.pdf *.log *.eeprom *.dat + @rm -f *.bin *.com *.img *.rom *.hex *.pdf *.log *.eeprom *.dat diff --git a/Source/Build.cmd b/Source/Build.cmd index b3322ee9..dcdf5e51 100644 --- a/Source/Build.cmd +++ b/Source/Build.cmd @@ -7,4 +7,5 @@ setlocal & call BuildShared || exit /b 1 & endlocal REM setlocal & call BuildBP || exit /b 1 & endlocal setlocal & call BuildImages || exit /b 1 & endlocal setlocal & call BuildROM %* || exit /b 1 & endlocal -setlocal & call BuildZRC %* || exit /b 1 & endlocal \ No newline at end of file +setlocal & call BuildZRC %* || exit /b 1 & endlocal +setlocal & call BuildZZR %* || exit /b 1 & endlocal \ No newline at end of file diff --git a/Source/BuildZZR.cmd b/Source/BuildZZR.cmd new file mode 100644 index 00000000..7445a6a1 --- /dev/null +++ b/Source/BuildZZR.cmd @@ -0,0 +1,4 @@ +@echo off +setlocal + +setlocal & cd ZZR && call Build || exit /b 1 & endlocal diff --git a/Source/CPM3/boot.z80 b/Source/CPM3/boot.z80 index f94b2704..9ddfbffb 100644 --- a/Source/CPM3/boot.z80 +++ b/Source/CPM3/boot.z80 @@ -15,9 +15,9 @@ extrn @srch1 extrn @hbbio extrn addhla - ;extrn phex16, phex8 - ;extrn cin, cout - ;extrn crlf, crlf2 + extrn phex16, phex8 + extrn cin, cout + extrn crlf, crlf2 extrn bcd2bin, bin2bcd include c:ver.lib @@ -555,33 +555,31 @@ d2c1: d2c2: add hl,de ; add non-leap days dec c ; dec leap counter - jr nz,d2c3 ; if not leap, bypss leap inc + jr nz,d2c3 ; if not leap, bypass leap inc inc hl ; add leap day ld c,4 ; reset leap year counter d2c3: djnz d2c2 ; loop for all years + d2c10: ; Add in days for elapsed months - ex de,hl ; save HL in DE - ld hl,daystbl ; point to table of cum days by month + ld de,daysmon ; point to start of days per mon tbl ld a,(tim$mon) ; get current month call bcd2bin ; convert to binary - dec a ; index from zero - rlca ; table entries are 2 bytes - call addhla ; offset to desired month entry - ld a,(hl) ; get the entry into HL - inc hl ; ... - ld h,(hl) ; ... - ld l,a ; ... - ex de,hl ; HL = day count, DE = months count - add hl,de ; add months count into day count - ; Add leap day for current year if appropriate - dec c ; C still has leap counter - jr nz,d2c20 ; skip if not leap year - ld a,(tim$mon) ; get cur mon - cp 3 ; March? - jr c,d2c20 ; skip if mon less than March - inc hl ; add leap day for cur year + dec a ; don't include cur mon + jr z,d2c20 ; done if Jan + ld b,a ; save as loop counter + cp 2 ; Mar = 2 + jr c,d2c11 ; bypass if < Mar (no leap month) + dec c ; C still has leap year counter + jr nz,d2c11 ; skip if not leap year + inc hl ; add in the leap day +d2c11: + ld a,(de) ; get days for cur mon + call addhla ; add to running count + inc de ; bump to next mon ptr + djnz d2c11 ; loop for # of months + d2c20: ; Add in days elapsed within month ; Note that we don't adjust the date to be a zero @@ -593,6 +591,8 @@ d2c20: call bcd2bin ; make binary call addhla ; add in days ld (@date),hl ; store in SCB + ;call phex16 ; *debug* + ;call crlf ; *debug* ret cpm2date: @@ -628,23 +628,22 @@ c2d3: ld a,c ; years to accum call bin2bcd ; convert to bcd ld (tim$yr),a ; ... and save it + ;call phex8 ; *debug* ; ; Now we use the days per month table to find the ; month. add hl,de ; restore days remaining - ld c,0 ; init month value (zero offset) + ld c,0 ; init month value (zero indexed) c2d4: ld a,c ; get month value - rlca ; times 2 for entry size push hl ; save hl (days remaining) ld hl,daysmon ; point to start of table call addhla ; point to month entry - ld e,(hl) ; get count - inc hl ; recover hl (days remaining) - ld d,(hl) ; de := cum days at end of month - pop hl + ld e,(hl) ; get months day count to E + ld d,0 ; zero msb, DE is days in month + pop hl ; recover hl (days remaining) ld a,c ; month value to accum - cp 1 ; possible leap month? + cp 1 ; leap month? check for Feb jr nz,c2d5 ; no, leave alone ld a,b ; get leap year flag (set above) or a ; leap year? @@ -661,6 +660,7 @@ c2d6: ld a,c ; move to accum call bin2bcd ; convert to bcd ld (tim$mon),a ; save it + ;call phex8 ; *debug* ; ; Leftover days is day value add hl,de ; restore days remaining @@ -668,41 +668,27 @@ c2d6: inc a ; switch from 0 to 1 offset call bin2bcd ; convert to bcd ld (tim$day),a ; save it + ;call phex8 ; *debug* ret -daystbl: - ; cumulative days elapsed by month (non-leap year) - dw 0 ; January - dw 31 ; February (non-leap) - dw 59 ; March - dw 90 ; April - dw 120 ; May - dw 151 ; June - dw 181 ; July - dw 212 ; August - dw 243 ; September - dw 273 ; October - dw 304 ; November - dw 334 ; December - daysmon: - ; days per month (non-leap year) - dw 31 ; January - dw 28 ; February (non-leap) - dw 31 ; March - dw 30 ; April - dw 31 ; May - dw 30 ; June - dw 31 ; July - dw 31 ; August - dw 30 ; September - dw 31 ; October - dw 30 ; November - dw 31 ; December - + ; days per month + db 31 ; January + db 28 ; February (non-leap) + db 31 ; March + db 30 ; April + db 31 ; May + db 30 ; June + db 31 ; July + db 31 ; August + db 30 ; September + db 31 ; October + db 30 ; November + db 31 ; December + +; RTC time buffer (all values packed bcd) - ; RTC time buffer (all values packed bcd) tim$buf: tim$yr db 80h tim$mon db 05h diff --git a/Source/HBIOS/romldr.asm b/Source/HBIOS/romldr.asm index f8f9954b..05b4cc33 100644 --- a/Source/HBIOS/romldr.asm +++ b/Source/HBIOS/romldr.asm @@ -2084,6 +2084,30 @@ newcon .db 0 newspeed .db 0 ; ;======================================================================= +; Working data storage +;======================================================================= +; + .fill 64,0 ; 32 level stack +bl_stack .equ $ ; ... top is here +; +#if (BIOS == BIOS_WBW) +bid_ldr .db 0 ; bank at startup +#endif +#if (BIOS == BIOS_UNA) +bid_ldr .dw 0 ; bank at startup +#endif +; +lba .fill 4,0 ; lba for load, dword +dma .dw 0 ; address for load +sps .dw 0 ; sectors per slice +mediaid .db 0 ; media id +; +ra_tbl_loc .dw 0 ; points to active ra_tbl +bootunit .db 0 ; boot disk unit +bootslice .db 0 ; boot disk slice +loadcnt .db 0 ; num disk sectors to load +; +;======================================================================= ; Pad remainder of ROM Loader ;======================================================================= ; @@ -2094,29 +2118,16 @@ slack .equ ($8000 + LDR_SIZ - $) .echo slack .echo " bytes.\n" ; +; ;======================================================================= -; Working data storage (uninitialized) +; Disk buffers (uninitialized) ;======================================================================= ; - .ds 64 ; 32 level stack -bl_stack .equ $ ; ... top is here -; -#if (BIOS == BIOS_WBW) -bid_ldr .ds 1 ; bank at startup -#endif -#if (BIOS == BIOS_UNA) -bid_ldr .ds 2 ; bank at startup -#endif -; -lba .ds 4 ; lba for load, dword -dma .ds 2 ; address for load -sps .ds 2 ; sectors per slice -mediaid .ds 1 ; media id +; Master Boot Record sector is read into area below. +; Note that this buffer is actually shared with bl_infosec +; buffer below. ; -ra_tbl_loc .ds 2 ; points to active ra_tbl -bootunit .ds 1 ; boot disk unit -bootslice .ds 1 ; boot disk slice -loadcnt .ds 1 ; num disk sectors to load +bl_mbrsec .equ $ ; ; Boot info sector is read into area below. ; The third sector of a disk device is reserved for boot info. @@ -2144,11 +2155,5 @@ bb_biloc .ds 2 ; loc to patch boot drive info bb_cpmloc .ds 2 ; final ram dest for cpm/cbios bb_cpmend .ds 2 ; end address for load bb_cpment .ds 2 ; CP/M entry point (cbios boot) -; -; -; Master Boot Record sector is read into area below. -; -bl_mbrsec .equ $ - .ds 512 ; .end diff --git a/Source/Makefile b/Source/Makefile index 1184c624..189430e2 100644 --- a/Source/Makefile +++ b/Source/Makefile @@ -12,5 +12,6 @@ SUBDIRS += ZPM3 #SUBDIRS += BPBIOS SUBDIRS += Images SUBDIRS += ZRC +SUBDIRS += ZZR TOOLS = ../Tools include $(TOOLS)/Makefile.inc diff --git a/Source/ZZR/Build.cmd b/Source/ZZR/Build.cmd new file mode 100644 index 00000000..57aecb92 --- /dev/null +++ b/Source/ZZR/Build.cmd @@ -0,0 +1,10 @@ +@echo off +setlocal + +if not exist ..\..\Binary\RCZ280_nat_zzr.rom goto :eof + +..\..\Tools\srecord\srec_cat.exe ..\..\Binary\RCZ280_nat_zzr.rom -Binary -Exclude 0x5000 0x7000 -Output ..\..\Binary\RCZ280_nat_zzr.hex -Intel + +copy /b zzr_cfldr.bin + zzr_ptbl.bin + zzr_fill_1.bin + zzr_mon.bin + zzr_fill_2.bin + ..\..\Binary\RCZ280_nat_zzr.rom + zzr_fill_3.bin ..\..\Binary\hd1024_zzr_prefix.dat + +copy /b ..\..\Binary\hd1024_zzr_prefix.dat + ..\..\Binary\hd1024_cpm22.img + ..\..\Binary\hd1024_zsdos.img + ..\..\Binary\hd1024_nzcom.img + ..\..\Binary\hd1024_cpm3.img + ..\..\Binary\hd1024_zpm3.img + ..\..\Binary\hd1024_ws4.img ..\..\Binary\hd1024_zzr_combo.img \ No newline at end of file diff --git a/Source/ZZR/Clean.cmd b/Source/ZZR/Clean.cmd new file mode 100644 index 00000000..fa12c5c7 --- /dev/null +++ b/Source/ZZR/Clean.cmd @@ -0,0 +1,3 @@ +@echo off +setlocal + diff --git a/Source/ZZR/Makefile b/Source/ZZR/Makefile new file mode 100644 index 00000000..2980517a --- /dev/null +++ b/Source/ZZR/Makefile @@ -0,0 +1,31 @@ +HD1024ZZRPREFIX = hd1024_zzr_prefix.dat +HD1024ZZZROMBOIMG = hd1024_zzr_combo.img +ZZRROM = ../../Binary/RCZ280_nat_zzr.rom +ZZRROMHEX = RCZ280_nat_zzr.hex +HD1024IMGS = ../../Binary/hd1024_cpm22.img ../../Binary/hd1024_zsdos.img ../../Binary/hd1024_nzcom.img \ + ../../Binary/hd1024_cpm3.img ../../Binary/hd1024_zpm3.img ../../Binary/hd1024_ws4.img + + +OBJECTS := + + +ifneq ($(wildcard $(ZZRROM)),) + OBJECTS += $(HD1024ZZRPREFIX) $(HD1024ZZZROMBOIMG) $(ZZRROMHEX) +endif + +DEST=../../Binary + +TOOLS = ../../Tools + +include $(TOOLS)/Makefile.inc + +DIFFPATH = $(DIFFTO)/Binary + +$(HD1024ZZRPREFIX): + cat zzr_cfldr.bin zzr_ptbl.bin zzr_fill_1.bin zzr_mon.bin zzr_fill_2.bin $(ZZRROM) zzr_fill_3.bin >$@ + +$(HD1024ZZZROMBOIMG): $(HD1024ZZRPREFIX) $(HD1024IMGS) + cat $^ > $@ + +$(ZZRROMHEX): $(ZZRROM) + srec_cat $(ZZRROM) -Binary -Exclude 0x5000 0x7000 -Output $(ZZRROMHEX) -Intel \ No newline at end of file diff --git a/Source/ZZR/ZZR Disk Layout.txt b/Source/ZZR/ZZR Disk Layout.txt new file mode 100644 index 00000000..18f06fc7 --- /dev/null +++ b/Source/ZZR/ZZR Disk Layout.txt @@ -0,0 +1,29 @@ +CF Boot Loader: Sector 0 (bytes 0-255) +RomWBW Partition Table: Sector 0 (bytes 256-511) +ZZRCC Monitor: Sectors 0xF8-0xFF (bytes 0x1F000-0x1FFFF) +RomWBW: Sectors 0x120-0x31F (bytes 0x24000-0x63FFF) +Start of Slices (0x1E partition): Sector 0x800 (byte 0x100000) + +Start Length Description +------- ------- --------------------------- +0x00000 0x00100 CF Boot Loader +0x00100 0x00100 RomWBW Partition Table +0x00200 0x1EE00 Filler +0x1F000 0x01000 ZZRCC Monitor +0x20000 0x04000 Filler +0x24000 0x40000 RomWBW +0x64000 0x9C000 Filler +0x100000: Start of slices (partition 0x1E) + +Notes +----- + +- At startup CPLD ROM is mapped to Z80 CPU address space 0x0000-0x003F, CPU begins execution at 0x0000 +- CPLD ROM (CF bootstrap mode) reads CF Boot Loader (256B) from start of CF (MBR) to 0xB000 and runs it +- CF Boot Loader reads ZRC Monitor (4KB) from sectors 0xF8-0xFF of CF to 0xB400 and runs it +- User sends ZZRCC RomWBW Loader hex file (?KB) at 0x5000, then runs it using G5000 +- User sends RomWBW ROM hex file, then runs it using G0000 + + +;;- ZZRCC Monitor reads 512KB (RomWBW) from sectors 0x120-0x51F of CF into first 512KB of RAM + diff --git a/Source/ZZR/zzr_cfldr.bin b/Source/ZZR/zzr_cfldr.bin new file mode 100644 index 00000000..04b6c228 Binary files /dev/null and b/Source/ZZR/zzr_cfldr.bin differ diff --git a/Source/ZZR/zzr_fill_1.bin b/Source/ZZR/zzr_fill_1.bin new file mode 100644 index 00000000..705bedcd Binary files /dev/null and b/Source/ZZR/zzr_fill_1.bin differ diff --git a/Source/ZZR/zzr_fill_2.bin b/Source/ZZR/zzr_fill_2.bin new file mode 100644 index 00000000..294f4016 Binary files /dev/null and b/Source/ZZR/zzr_fill_2.bin differ diff --git a/Source/ZZR/zzr_fill_3.bin b/Source/ZZR/zzr_fill_3.bin new file mode 100644 index 00000000..38b2e993 Binary files /dev/null and b/Source/ZZR/zzr_fill_3.bin differ diff --git a/Source/ZZR/zzr_mon.bin b/Source/ZZR/zzr_mon.bin new file mode 100644 index 00000000..719029c1 Binary files /dev/null and b/Source/ZZR/zzr_mon.bin differ diff --git a/Source/ZZR/zzr_ptbl.bin b/Source/ZZR/zzr_ptbl.bin new file mode 100644 index 00000000..5e3a2a4d Binary files /dev/null and b/Source/ZZR/zzr_ptbl.bin differ diff --git a/Source/ver.inc b/Source/ver.inc index 4778cc06..5b3aafd8 100644 --- a/Source/ver.inc +++ b/Source/ver.inc @@ -2,4 +2,4 @@ #DEFINE RMN 1 #DEFINE RUP 1 #DEFINE RTP 0 -#DEFINE BIOSVER "3.1.1-pre.59" +#DEFINE BIOSVER "3.1.1-pre.62" diff --git a/Source/ver.lib b/Source/ver.lib index a3b67e1d..dd1b0ca3 100644 --- a/Source/ver.lib +++ b/Source/ver.lib @@ -3,5 +3,5 @@ rmn equ 1 rup equ 1 rtp equ 0 biosver macro - db "3.1.1-pre.59" + db "3.1.1-pre.62" endm diff --git a/Tools/hex2bin/BIN2HEX.EXE b/Tools/hex2bin/BIN2HEX.EXE deleted file mode 100644 index add40684..00000000 Binary files a/Tools/hex2bin/BIN2HEX.EXE and /dev/null differ diff --git a/Tools/hex2bin/COPYING b/Tools/hex2bin/COPYING deleted file mode 100644 index 5b244d55..00000000 --- a/Tools/hex2bin/COPYING +++ /dev/null @@ -1,676 +0,0 @@ - - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program 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 . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. - diff --git a/Tools/hex2bin/HEX2BIN.C b/Tools/hex2bin/HEX2BIN.C deleted file mode 100644 index f971bb9d..00000000 --- a/Tools/hex2bin/HEX2BIN.C +++ /dev/null @@ -1,633 +0,0 @@ -/* hex2bin.c -- yet another reader and writer of Intel hex files - Copyright (C) 2011 John R Coffman . -*********************************************************************** - When invoked as 'hex2bin' read a sequence of Intel hex files - and create an overlaid binary file. - - When invoked as 'bin2hex' read a binary file and create an - Intel hex file. - - All command line numeric constants may be specified in any - radix. -*********************************************************************** - - This program 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 - in the file COPYING in the distribution directory along with this - program. If not, see . - -**********************************************************************/ -#include -#include -#include -#include "mytypes.h" - -#define true 1 -#define false 0 -#define SEG_MASK 0x00FFFFu -#define LBA_MASK 0x00FF0000ul -#define MAX_MASK (LBA_MASK|SEG_MASK) -#define ONE_MEG 0x100000ul - -dword upper_lba = 0; /* upper address */ -dword address_mask = SEG_MASK; /* address mask */ -byte pad = 0xFF; -byte *buffer; -dword rom_size = 0; -dword overwrite; /* count of possible overwrites */ -byte h2b, verbose, segmented; -char *outfilename = NULL; -char *binfilename = NULL; -dword source_address, source_limit; -dword dest_address, dest_limit; -FILE *infile; -FILE *outfile; -byte checksum; -char line[1024]; -char *lp; -long int lineno; - - - -dword convert_constant(char *str) -{ - char *final; - dword value = strtoul(str, &final, 0); - - if (*final == 'k' || *final == 'K') value *= 1024ul; - else if (*final == 'M' || *final == 'm') value *= ONE_MEG; - - return value; -} - -void error(byte level, char *msg) -{ - printf("%s(%d): %s\n", - level>1 ? "Error" : "Warning", (int)level, msg); - if (level>1) exit(level); - else if (level==0) printf("line %ld %s", lineno, line); -} - - -int getnibble(void) -{ - char ch; - - ch = -1; - if (lp) { - ch = *lp++; - if (ch>='0' && ch<='9') ch -= '0'; - else if (ch>='A' && ch<='F') ch -= 'A'-10; - else if (ch>='a' && ch<='f') ch -= 'a'-10; - else { - error(0,"Illegal hex digit"); - ch = -1; - } - } - else error(0,"Line is too short"); - return (int)ch; -} - -int getbyte(void) -{ - int b = getnibble(); - b <<= 4; - b += getnibble(); - checksum += b; - return b; -} - -int getword(void) -{ - int w = getbyte(); - w <<= 8; - w += getbyte(); - return w; -} - -dword getdword(void) -{ - dword d = getword(); - d <<= 16; - d += getword(); - return d; -} - -/* added for SREC files */ -dword get6word(void) -{ - dword d = getword(); - d <<= 8; - d += getbyte(); - return d; -} - - -void putbyte(dword address, byte data) -{ - if (address < source_address || address > source_limit) return; - address -= source_address; - address += dest_address; - if (address > dest_limit) return; - if (address >= rom_size) { - printf("Line %ld ", lineno); error(2,"Data beyond end of ROM"); - } - if (buffer[address] != pad) { - overwrite++; - if (verbose || overwrite<=100) printf("Warning(1): Overwrite at ROM address 0x%lX\n", address); - } - buffer[address] = data; -} - - -void usage(void) -{ - printf("hex2bin.c (bin2hex) -- " __TIMESTAMP__ ".\n" - "Copyright (c) 2011 John R Coffman. All rights reserved.\n" - "Distributed under the GNU General Public License, a copy of which\n" - "is contained in the file COPYING in the distribution directory.\n\n"); - if (h2b) printf( - "Usage:\n" - " hex2bin [ [/M]]+\n\n" - " Options:\n" - " -o \n" - " -p \n" - " -R default 64K\n" - " -v []\n" - " Flags:\n" - " -d \n" - " -D \n" - " -s \n" - " -S \n" - " Suffix:\n" - " /M marks a Motorola S-record input file\n" - ); - else printf( - "Usage:\n" - " bin2hex [ ]+\n\n" - " Options:\n" - " -g use Intel seGmented addressing\n" - " -o \n" - " -p \n" - " -R default 1024K\n" - " -v []\n" - " Flags:\n" - " -d \n" - " -D \n" - " -s \n" - " -S \n" - ); -} - - -void hout_byte(byte data) -{ - checksum -= data; - fprintf(outfile, "%02X", (int)data); -} -void hout_word(word data) -{ - hout_byte(data>>8); - hout_byte(data); -} -void begin_record(byte length) -{ - checksum = 0; - fputc(':', outfile); - hout_byte(length); -} -void end_record(void) -{ - hout_byte(checksum); - fputc('\n', outfile); -} - -void write_lba(dword address) -{ - if (verbose==5) printf("Address: %06lX\n", address); - - if ((address & LBA_MASK) != upper_lba) { - upper_lba = address & LBA_MASK; - begin_record(2); - hout_word(0); - if (rom_size > ONE_MEG || !segmented) { - hout_byte(4); /* linear address */ - hout_word(upper_lba>>16); - } - else { /* handle ROMs 1meg and smaller */ - hout_byte(2); /* segment address */ - hout_word(upper_lba>>4); - } - end_record(); - } -} - -void write_data(word nbytes, byte *buf, dword address) -{ - /* compress from the high end */ - while (nbytes && buf[nbytes-1]==pad) --nbytes; - /* compress from the low end */ - while (nbytes && *buf==pad) { - ++buf; - ++address; - --nbytes; - } - if (nbytes) { - write_lba(address); - begin_record(nbytes); - hout_word(address & 0xFFFFu); - hout_byte(0); /* data record */ - while(nbytes--) hout_byte(*buf++); - end_record(); - } -} - -#define min(a,b) ((a)<(b)?(a):(b)) -#define NREC 16 - -void write_hex_file(FILE *outfile) -{ - dword nbytes; - dword vaddr; - dword n; - byte *buf; - - buf = buffer; - vaddr = 0; - nbytes = rom_size; - n = min(nbytes, NREC); - do { - write_data(n, buf, vaddr); - buf += n; - vaddr += n; - nbytes -= n; - n = min(nbytes, NREC); - } while (n); -/* write the end-of-file record */ - fprintf(outfile,":00000001FF\n"); -} - - -void scan_bin_file(char *filename) -{ - dword length; - dword nbytes; - int data; - dword inaddr; - - infile = fopen(filename, "rb"); - if (!infile) { - strcpy(line,"Cannot find file: "); - error(5, strcat(line, filename)); - } -/*** length = filelength(fileno(infile)); ***/ - fseek(infile, 0L, SEEK_END); - length = ftell(infile); -/***/ - nbytes = 0; - inaddr = dest_address; - if (source_address < length) { - fseek(infile, source_address, SEEK_SET); - while (inaddr=3) printf("%s", lp-1); - checksum = 0; - rectype = getnibble(); - ldata = getbyte(); - switch(rectype) { /* get variable address field */ - case 0: - case 1: - case 5: - case 9: - laddr = getword(); - ldata -= 2; - break; - case 2: - case 8: - laddr = get6word(); - ldata -= 3; - break; - case 3: - case 7: - laddr = getdword(); - ldata -= 4; - break; - default: - error(0,"Unknown record type:"); - } - if (rectype>=1 && rectype<=3) { - index = 0; - while (--ldata) { - data = getbyte(); - /* no address mask used */ - putbyte(laddr + index, data); - index++; - } - } - else if (rectype==0) { - printf("Comment: "); - while (--ldata) { - printf("%c", (char)getbyte()); - } - printf("\n"); - } - /* else records 5,7,8,9 are ignored */ - - data = getbyte(); /* get final checksum */ - if (checksum != 0xFF) { - error(0,"Checksum failure"); - } - } while (lp && !EndOfFile); - fclose(infile); -} - -void scan_Intel_file(char *filename) -{ - byte ldata; - dword laddr; - byte rectype; - dword value; - dword index; - byte data; - byte EndOfFile = 0; - - infile = fopen(filename, "rt"); - if (!infile) { - strcpy(line,"Cannot find file: "); - error(5, strcat(line, filename)); - } - upper_lba = 0; - lineno = 0; - do { - lineno++; - lp = fgets(line, nelem(line)-1, infile); - if (lp == NULL) break; - if (*lp++ != ':') { - printf("Comment: %s",--lp); - continue; - } - if (verbose>=3) printf("%s", lp-1); - checksum = 0; - ldata = getbyte(); - laddr = getword(); - rectype = getbyte(); - switch (rectype) { - case 0: /* data record */ - index = 0; - while (ldata--) { - data = getbyte(); - putbyte(upper_lba + ((laddr + index)&address_mask), data); - index++; - } - break; - case 1: /* end of file record */ - EndOfFile = 1; - break; - case 2: /* segment address */ - address_mask = SEG_MASK; - value = getword(); - upper_lba = value<<4; /* start of segment */ - ldata -= 2; - break; - case 4: /* linear upper address */ - address_mask = MAX_MASK; - value = getword(); - upper_lba = value<<16; /* full 32-bit address range */ - ldata -= 2; - break; - case 3: /* start CS:IP */ - case 5: /* linear start address */ - value = getdword(); - ldata -= 4; - break; - default: - error(0,"Unknown record type:"); - } - getbyte(); /* get final checksum */ - if ( (checksum & 0xFF) ) { - error(0,"Checksum failure"); - } - } while (lp && !EndOfFile); - fclose(infile); -} - - -void scan_hex_file(char *filename) -{ - int i = strlen(filename); - - if (i>3 && filename[i-2]=='/' - && (filename[i-1]=='M') ) { - filename[i-2] = 0; /* remove suffix */ - scan_srec_file(filename); - } - else scan_Intel_file(filename); -} - - -void global_options(int argc, char *argv[]) -{ - int iarg; - char *cp; - char *tp; - char ch; - - h2b = false; - rom_size = ONE_MEG; /* bin2hex default value */ -/* decide which conversion to do */ - if (strstr(argv[0],"hex2bin") -#ifdef MSDOS - || strstr(argv[0],"HEX2BIN") -#endif - ) { - h2b = true; - rom_size = 64 * 1024ul; /* default value */ - } /* assume 'bin2hex' otherwise */ - - if (argc<2) { usage(); exit(0); } - -/* scan the global command line options */ - for (iarg = 0; iarg MAX_MASK+1) error(5, "ROM size too big"); - if (rom_size < 256) error(5, "ROM size too small"); - *cp = *tp = 0; - break; - case 'v': /* print verbose statistics */ - verbose++; - if (!*tp) tp = argv[++iarg]; - if (*tp>='1' && *tp<='5' && tp[1]==0) verbose += (*tp - '1'); - else tp = cp; - *cp = *tp = 0; - break; - case 'Y': { - int i; - for (i=0; i [ | ]+ - bin2hex - - Options: - -g -- Use Intel seGmented addressing in hex files for - ROMs between 64k and 1M in size. Normally, linear - addressing is used for ROMs bigger than 64k. For - ROMs larger than 1M, this switch has no effect, - since only linear addressing is possible. - - -o -- default is 'out.bin' or 'out.hex' - No suffix is added to the filename, so the full - file name must be specified. - - -p -- default is 0xFF, which is the erased - value for most ROM's. Pad bytes are not explicitly - written out when 'bin2hex' is used. This reduces - the size of sparse ROM images. - - -R -- may be any value. Normally this will be - specified as '128k' or 0x10000. The suffixes 'k' - and 'M' are recognized. The default value is 64k - for 'hex2bin' and 1M for 'bin2hex'. - - -v [] -- used primarily for debugging. A - verbosity level of 3 will print each line as it is - processed. - - Options are global, and may be specified anywhere on the command - line. Only 'flags', below, are position sensitive. Flags must - be specified immediately before the file name they are to affect. - They do not affect more that a single file. They reset to their - default values before the next input file, scanning left to - right, is processed. - - Flags: - Flag values apply only to the following file, and are reset - to the default values before the next file is processed. The - source and destination flags allow code to be relocated - within the ROM so that code may be loaded at a different - location than where it will ultimately be run. - - -d -- default is 0. - data will only be loaded between the limits of - the -d address and the -D address - minus 1. - - -D -- default is 16M. No data - will be loaded at or above this address. - - -s -- default is 0. Hex input - is only processed if it falls at addresses in the - .hex input file between the -s address and the - -S address minus 1. Likewise, Bin input - is only processed if it falls between similar limits - in the input ROM image. - - -S -- default is 16M. No input - data at or above this address will be processed. - - Suffix: - For HEX to BIN conversions, a suffix may be appended to an - input filename to indicate that it is in Motorola S-record - format instead of Intel hex format. - - /M -- there may be no space between the file- - name and the /M suffix. The foregoing file is a - Motorola S-record (S19) file, not an Intel hex file. - - Numeric values on the command line may be specified in any C-like - syntax: 0x0000 is hexadecimal, 1234 is decimal, and 0177 is - octal. In addition the suffixes 'k' for kilo- and 'M' for mega- - cause the preceding values to be multiplied by 1024 or 1048576, - respectively. - - Examples: - hex2bin -p 0xFF -R32k cpm22.hex -o cpmtest.bin - hex2bin -o cpmtest.bin cpm22.hex -R 0x8000 -p255 - - The preceding two lines have identical effects in all - respects. - - hex2bin -R 1M -s 0xd000 -d 0x0800 -D0x2800 image.hex \ - pagezero.hex -oROMIMAGE.bin - - The above line loads the 'pagezero.hex' file at the exact - addresses specified in the file; however, the 'image.hex' file - is assembled at 0xD000, must run at 0xD000, but is loaded - between 0x800 <= addr < 0x2800. It is presumed that the - code will be relocated to the correct address before it is - executed. - - hex2bin -R16K tutor.S68/M -o tutor.bin - - The above line converts the Mororola SREC file 'tutor.S68' - to a flat 16K binary file named 'tutor.bin'. - - bin2hex -R128k romimage.bin -o image.hex - - Simple conversion from a BIN file to a HEX file. The ROM - data is limited to 128k. - - bin2hex -s 0x1000 -S 0x2000 -d 0x21000 romimage.bin \ - -o Relocated.hex - - Extract from a ROM image file all of the data between 0x1000 - and 0x1FFF, inclusive, and write to an Intel hex file for - re-loading two 64k segments higher in a future ROM. - - -(end) - \ No newline at end of file diff --git a/Tools/hex2bin/HEX2BIN.EXE b/Tools/hex2bin/HEX2BIN.EXE deleted file mode 100644 index add40684..00000000 Binary files a/Tools/hex2bin/HEX2BIN.EXE and /dev/null differ diff --git a/Tools/hex2bin/MAKEFILE b/Tools/hex2bin/MAKEFILE deleted file mode 100644 index 6e74b322..00000000 --- a/Tools/hex2bin/MAKEFILE +++ /dev/null @@ -1,37 +0,0 @@ -# makefile for tools -# -# Uses DJGCC for Windows -- GCC v. 4.4.4 compiles it -# -CC = gcc -COPT = -O2 -Wall -RM = del >nul -CP = copy - -E = .exe -O = .o - -.c$E: - $(CC) $(COPT) -o $*$E $*.c - -TOOLS = hex2bin$E bin2hex$E -HFILES = mytypes.h - - -all: $(TOOLS) - -bin2hex$E: hex2bin$E - $(CP) hex2bin$E bin2hex$E - -clean: - $(RM) *$O - $(RM) hex2bin$E - $(RM) bin2hex$E - $(RM) foo*.* - -spotless: clean - $(RM) *.bin - $(RM) *.hex - -##Dependencies -hex2bin$E: hex2bin.c $(HFILES) - \ No newline at end of file diff --git a/Tools/hex2bin/MYTYPES.H b/Tools/hex2bin/MYTYPES.H deleted file mode 100644 index c97ed7eb..00000000 --- a/Tools/hex2bin/MYTYPES.H +++ /dev/null @@ -1,16 +0,0 @@ -#ifndef __MYTYPES_H -#define __MYTYPES_H 1 - -typedef unsigned char byte; -typedef unsigned short word; -typedef unsigned long dword; - - -#ifdef __SDCC__ -#define outp(port,byte) port = (byte) -#define inp(port) (port) -#endif - -#define nelem(x) (sizeof(x)/sizeof(x[0])) - -#endif /* __MYTYPES_H */ diff --git a/Tools/srecord/README.pdf b/Tools/srecord/README.pdf new file mode 100644 index 00000000..2425feb6 Binary files /dev/null and b/Tools/srecord/README.pdf differ diff --git a/Tools/srecord/Readme-Windows.txt b/Tools/srecord/Readme-Windows.txt new file mode 100644 index 00000000..f206ce06 --- /dev/null +++ b/Tools/srecord/Readme-Windows.txt @@ -0,0 +1,73 @@ +If you just want to use the srecord tools, you can stop reading here. + +Following are instructions how I (Jens Heilig) built the srecord tools on Windows: + +How to build srecord 1.64 tools on Windows: + +PREREQUISITES: +============== +1) MinGW +Download and install mingw-get-inst (I used version 20110530) from http://mingw.sourceforge.net/ Select C++ and MinGW Developer Toolkit during installation. + +Start MinGW Shell from the Windows Start Menu. +Install additional packages by entering following commands at the prompt: +(the "$"-sign indicates the shell-prompt. Do not type it) +$ mingw-get.exe install msys-groff-ext +$ mingw-get.exe install gettext + +2) Boost Library +Download and install the Boost library from here: http://ascend4.org/Binary_installer_for_Boost_on_MinGW +Copy the newly installed files to you MinGW directory: +$ cp /lib/* /lib/ +$ cp -r /include/boost-1_41/boost /include/ + + +3) libgcrpyt library +Download libgcrypt-1.5.0.tar.bz2 and libgpg-error-1.10.tar.bz2 (newer versions should also work) from http://www.gnupg.org/download/index.en.html +cd to the directory where the two downloaded files are (make sure the path to this directory does not contain spaces) +$ tar jxfv libgpg-error-1.10.tar.bz2 +$ cd libgpg-error-1.10 +$ ./configure --disable-shared --enable-static && make && make install +(the previous step might hang when converting from ISO-8859-2 to UTF-8 late in the build process. Press ctrl-c and proceed) +$ cd .. +$ tar libgcrypt-1.5.0.tar.bz2 +$ cd libgcrypt +$ ./configure --disable-shared --enable-static && make && make install + +You now have all the prerequisites required to build the srecord tools. Let's proceed. + + +BUILDING SRECORD TOOLS +====================== +cd to the directory where you unpacked the srecord source code. + +Starting with srecord version 1.63 (and including version 1.64), it is necessary to modify Makefile.in: +In line 4096 remove the text "bin/test_gecos", so the line becomes: + bin/test_crc16 bin/test_fletcher16 \ + +Reason: This test program cannot be built because it requires the pwd.h header and Linux functions which are not available in MinGW + + +Finally, start the actual build process: + +Start configure for srecord: +$ CPPFLAGS="-static -I/include -I/usr/local/include" LDFLAGS="-L/lib -L/usr/local/lib" CC='gcc -static-libgcc' CXX='g++ -static-libgcc -static-libstdc++' LIBS=-lgpg-error ./configure + +After configure has run successfully, start the build process: +$ make + +After successful build process, run the tests: +$ make -i sure + +All tests should succeed. + +Next, reduce the size of the built programs by removing debugging information: +$ cd bin +$ strip *.exe + +Finally, move srec_cat.exe, srec_info.exe and srec_cmp.exe from the bin directory to where you want them, you can then delete everything else in the bin-directory. + +You should now have working srecord tools! + +Good Luck! +Jens Heilig, 2014-06-22 diff --git a/Tools/srecord/srec_cat.exe b/Tools/srecord/srec_cat.exe new file mode 100644 index 00000000..31d4d0cd Binary files /dev/null and b/Tools/srecord/srec_cat.exe differ diff --git a/Tools/srecord/srec_cmp.exe b/Tools/srecord/srec_cmp.exe new file mode 100644 index 00000000..66827808 Binary files /dev/null and b/Tools/srecord/srec_cmp.exe differ diff --git a/Tools/srecord/srec_info.exe b/Tools/srecord/srec_info.exe new file mode 100644 index 00000000..b71f774a Binary files /dev/null and b/Tools/srecord/srec_info.exe differ diff --git a/Tools/srecord/srecord-1.64.pdf b/Tools/srecord/srecord-1.64.pdf new file mode 100644 index 00000000..97b49159 Binary files /dev/null and b/Tools/srecord/srecord-1.64.pdf differ