Move a2_hex2bin.py from /disasm where it is no longer used to /loader, create matchin...

diff --git a/disasm/Makefile b/disasm/Makefile
index 23715d4..99874cb 100644 (file)
--- a/disasm/Makefile
+++ b/disasm/Makefile
@@ -38,9 +38,12 @@ star_blazer.ihx: star_blazer.rel
 -b udata1=0x400 \
 -b text=0xa00 \
 -b data0=0x4000 \
+-b data1=0xd000 \
 $@ $<
-       # hack for now: insert start linear address record
-       sed -e 's/^:00000001FF/:04000005000017D10F\n&/' -i star_blazer.ihx
+       ./entry_point.py \
+0x`sed -ne 's/^    \(....\)  start   /\1/p' star_blazer.map` \
+$@ \
+$@
 
 star_blazer.rel: \
 star_blazer.asm \

diff --git a/disasm/entry_point.py b/disasm/entry_point.py
new file mode 100755 (executable)
index 0000000..39f878e
--- /dev/null
+++ b/disasm/entry_point.py
@@ -0,0 +1,21 @@
+#!/usr/bin/env python3
+
+import sys
+from intelhex import IntelHex
+
+EXIT_SUCCESS = 0
+EXIT_FAILURE = 1
+
+if len(sys.argv) < 4:
+  print(f'usage: {sys.argv[0]:s} entry_point in.ihx out.ihx')
+  sys.exit(EXIT_FAILURE)
+entry_point = int(sys.argv[1], 0)
+in_ihx = sys.argv[2]
+out_ihx = sys.argv[3]
+
+intelhex = IntelHex(in_ihx)
+segments = [j for i in intelhex.segments() for j in i]
+for i in range(0, len(segments), 2):
+  print(f'[{segments[i]:04x}, {segments[i + 1]:04x})')
+intelhex.start_addr = {'EIP': entry_point}
+intelhex.write_hex_file(out_ihx)

diff --git a/disasm/star_blazer.asm.patch b/disasm/star_blazer.asm.patch
index 739f615..73e493a 100644 (file)
--- a/disasm/star_blazer.asm.patch
+++ b/disasm/star_blazer.asm.patch
@@ -1,15 +1,15 @@
---- star_blazer.asm0   2022-06-22 12:37:18.308006037 +1000
-+++ star_blazer.asm    2022-06-22 12:41:24.552008560 +1000
+--- star_blazer.asm0   2022-06-22 13:56:47.424054893 +1000
++++ star_blazer.asm    2022-06-22 13:56:47.428054893 +1000
 @@ -1,3 +1,8 @@
-+ALIGN = 1
-+DHGR = 0
++ALIGN = 0
++DHGR = 1
 +PIXEL_SHAPE = 0
 +SHAPE = 1
 +
  hires_screen = 0x2000                 ; 2000
  hw_kbd = 0xc000                               ; c000
  hw_kbdstrb = 0xc010                   ; c010
-@@ -12,19 +17,47 @@
+@@ -12,19 +17,49 @@
  hw_ptrig = 0xc070                     ; c070
  rom_pread = 0xfb1e                    ; fb1e
  
@@ -40,6 +40,8 @@
 +hw_clr80vid = 0xc00c
 +hw_set80vid = 0xc00d
 +.endif
++
++      .globl  start
 +
        .area   zpage
  
@@ -61,7 +63,7 @@
        .ds     0x30                    ; 0050
  half_dimension:
        .ds     1                       ; 0080 rw
-@@ -48,6 +81,14 @@
+@@ -48,6 +83,14 @@
  draw_y:       .ds     1                       ; 008a rw
  video_line_ptr:
        .ds     2                       ; 008b rw
@@ -76,7 +78,7 @@
  draw_misc_mask:
        .ds     1                       ; 008d rw
  draw_misc_mask_temp:
-@@ -159,7 +200,7 @@
+@@ -159,7 +202,7 @@
        .area   udata0
  
  vec_restart:
@@ -85,7 +87,7 @@
  
        .area   udata1
  
-@@ -188,8 +229,8 @@
+@@ -188,8 +231,8 @@
        .ds     0x70                    ; 0780 rw
  
        .area   text
@@ -95,7 +97,7 @@
  sign_extend_a_to_ya:
        cmp     #0x80                   ; 0abc,0adc,133f,1366,1382,145b,1485 -> 0a00 -> 0a02 r a=00..ff
        ldy     #0x00                   ; 0a00 -> 0a02 -> 0a04 r
-@@ -1072,7 +1113,7 @@
+@@ -1072,7 +1115,7 @@
        tsx                             ; 1095 -> 1097 -> 1098 r
        stx     *microcode_sp           ; 1097 -> 1098 -> 109a r
        ldx     *microcode_object_c9    ; 1098 -> 109a -> 109c r
@@ -104,7 +106,7 @@
        sta     *microcode_object_cc    ; 109c -> 109f -> 10a1 r
  loc_10a1:
        ldy     #0x00                   ; 1090,109f -> 10a1 -> 10a3 r
-@@ -1099,7 +1140,7 @@
+@@ -1099,7 +1142,7 @@
        jsr     do_microcode_test1      ; 10c6 -> 10c8 -> 106a r s=f7..f9,02
        bne     3$                      ; 107b -> 10cb -> 10c0 r z=0
  loc_10cd:
@@ -113,7 +115,7 @@
        rts                             ; 10cd -> 10d0 -> 123e,143a,1615,1629,1633,1649,165b,1759 r s=f7..fd,02
  sub_10d1:
        beq     rts_10ec                ; 1216,123b,1260,1285 -> 10d1 -> 10d3,10ec r z=0..1
-@@ -1985,6 +2026,9 @@
+@@ -1985,6 +2028,9 @@
        bit     *vec_draw_misc_from_table ; 17d1 -> 17d4 -> 17d6 r
        ora     hw_pb1                  ; 17d4 -> 17d6 -> 17d9 r
        bpl     1$                      ; 17d6 -> 17d9 -> 17f2 r n=0
@@ -123,7 +125,7 @@
        ldx     #0x01                   ; 17db r
  0$:   jsr     rom_pread               ; 17dd r
        cpy     #0xff                   ; 17e0 r
-@@ -1995,18 +2039,15 @@
+@@ -1995,18 +2041,15 @@
        sta     bvar_179e               ; 17e9 r
        sta     bvar_17a3               ; 17ec r
        sta     bvar_1e0e               ; 17ef r
@@ -151,7 +153,7 @@
  divide_a_by_y:
        sta     *accumulator + 1        ; 0a90,0aa0,0ab5,0ad5 -> 1800 -> 1802 r
        lda     #0x00                   ; 1800 -> 1802 -> 1804 r
-@@ -2071,10 +2112,12 @@
+@@ -2071,10 +2114,12 @@
        lda     *result + 1             ; 186e r
        ldy     *result + 2             ; 1870 r
        rts                             ; 1872 r
@@ -164,7 +166,7 @@
  random_init:
        lda     *random_seed            ; 16ae -> 187a -> 187c r
        ora     #0x01                   ; 187a -> 187c -> 187e r
-@@ -2233,16 +2276,31 @@
+@@ -2233,16 +2278,31 @@
        ldx     #>hires_screen          ; 199b -> 199d -> 199f r
        stx     *video_line_ptr + 1     ; 199d -> 199f -> 19a1 r
        tay                             ; 199f -> 19a1 -> 19a2 r
@@ -197,7 +199,7 @@
        rts                             ; 19b5 -> 19b8 -> 1713 r s=fd
  video_clear_rectangle:
        ldx     *clip_y0                ; 1064 -> 19b9 -> 19bb r
-@@ -2252,7 +2310,13 @@
+@@ -2252,7 +2312,13 @@
        sta     *video_line_ptr + 1     ; 19c0 -> 19c3 -> 19c5 r
        ldy     *clip_x0                ; 19c3 -> 19c5 -> 19c7 r
        lda     #0x00                   ; 19c5 -> 19c7 -> 19c9 r
@@ -212,7 +214,7 @@
        iny                             ; 19c9 -> 19cb -> 19cc r
        cpy     *clip_x1                ; 19cb -> 19cc -> 19ce r y=6d..94
        bcc     1$                      ; 19cc -> 19ce -> 19c9,19d0 r c=0..1
-@@ -2300,6 +2364,7 @@
+@@ -2300,6 +2366,7 @@
        sta     object1080_y0 - 0x10,x  ; 1a1b -> 1a1e -> 1a21 r x=10..7f
        adc     #0x01                   ; 1a1e -> 1a21 -> 1a23 r c=0..1 d=0
        sta     object1080_y1 - 0x10,x  ; 1a21 -> 1a23 -> 1a26 r x=10..7f
@@ -220,7 +222,7 @@
        rts                             ; 1a23 -> 1a26 -> 1076,1179,1602 r s=f1..f9,02
  pixel_data_table_left:
        .db     0x83                    ; 1a27 r
-@@ -2382,14 +2447,17 @@
+@@ -2382,14 +2449,17 @@
        lda     object1080_onscreen_shape_ptr_hi - 0x10,x ; 1aa5 -> 1aa7 -> 1aaa r x=20..4f
        ora     [*video_line_ptr],y     ; 1aa7 -> 1aaa -> 1aac r y=6d..93,02
        sta     [*video_line_ptr],y     ; 1aaa -> 1aac -> 1aae r y=6d..93,02
@@ -238,7 +240,7 @@
        lda     object1080_y0 - 0x10,x  ; 1ab9 -> 1abb -> 1abe r x=14..77
        cmp     object1080_y1 - 0x10,x  ; 1abb -> 1abe -> 1ac1 r a=11..d4 x=14..77
        bcs     rts_1aae                ; 1abe -> 1ac1 -> 1ac3 r c=0
-@@ -2453,8 +2521,14 @@
+@@ -2453,8 +2523,14 @@
        cmp     *draw_x1                ; 1b49 -> 1b4b -> 1b4d r a=94
        bcc     8$                      ; 1b4b -> 1b4d -> 1b4f,1b83 r c=0..1
        lda     object1080_onscreen_shape_ptr_lo - 0x10,x ; 1b4d -> 1b4f -> 1b52 r x=14..77
@@ -253,7 +255,7 @@
        sta     7$ + 1                  ; 1b55 -> 1b58 -> 1b5b r
        ldx     #0x00                   ; 1b58 -> 1b5b -> 1b5d r
        ldy     *draw_y                 ; 1b5b -> 1b5d -> 1b5f r
-@@ -2463,7 +2537,17 @@
+@@ -2463,7 +2539,17 @@
        lda     video_line_table_hi - 0x20,y ; 1b62 -> 1b64 -> 1b67 r y=28..cf
        sta     *video_line_ptr + 1     ; 1b64 -> 1b67 -> 1b69 r
        ldy     *draw_x0                ; 1b67 -> 1b69 -> 1b6b r
@@ -272,7 +274,7 @@
  7$:   .dw     shape_12_exhaust0 + 0x12 ; 1b6c rw
        ora     [*video_line_ptr],y     ; 1b6b -> 1b6e -> 1b70 r y=6c..93
        sta     [*video_line_ptr],y     ; 1b6e -> 1b70 -> 1b72 r y=6c..93
-@@ -2479,14 +2563,23 @@
+@@ -2479,14 +2565,23 @@
        rts                             ; 1b80 -> 1b82 -> 15cd r s=fb
  8$:   inc     object1080_onscreen_clipped - 0x10,x ; 1b3b,1b41,1b47,1b4d -> 1b83 -> 1b86 r x=14..77
        lda     object1080_onscreen_shape_ptr_lo - 0x10,x ; 1b83 -> 1b86 -> 1b89 r x=14..77
@@ -298,7 +300,7 @@
        sta     *video_line_ptr + 1     ; 1b9b -> 1b9e -> 1ba0 r
        ldy     *draw_x0                ; 1b9e -> 1ba0 -> 1ba2 r
  10$:  lda     *draw_y                 ; 1ba0,1bbf -> 1ba2 -> 1ba4 r
-@@ -2498,11 +2591,23 @@
+@@ -2498,11 +2593,23 @@
        bcc     12$                     ; 1bac -> 1bae -> 1bb0,1bbb r c=0..1
        cpy     *clip_x1                ; 1bae -> 1bb0 -> 1bb2 r y=6c..a4
        bcs     12$                     ; 1bb0 -> 1bb2 -> 1bb4,1bbb r c=0..1
@@ -323,7 +325,7 @@
        iny                             ; 1bbb -> 1bbc -> 1bbd r
        cpy     *draw_x1                ; 1bbc -> 1bbd -> 1bbf r y=5c..a5
        bcc     10$                     ; 1bbd -> 1bbf -> 1ba2,1bc1 r c=0..1
-@@ -2511,6 +2616,7 @@
+@@ -2511,6 +2618,7 @@
        cpy     *draw_y1                ; 1bc3 -> 1bc5 -> 1bc7 r y=12..d9
        bcc     9$                      ; 1bc5 -> 1bc7 -> 1b96,1bc9 r c=0..1
        ldx     *x_save                 ; 1bc7 -> 1bc9 -> 1bcb r
@@ -331,7 +333,7 @@
        rts                             ; 1bc9 -> 1bcb -> 15cd r s=fb
  erase_pixel_object:
        lda     #0x00                   ; 1c12 -> 1bcc -> 1bce r
-@@ -2542,12 +2648,15 @@
+@@ -2542,12 +2650,15 @@
        eor     #0xff                   ; 1c03 -> 1c06 -> 1c08 r
        and     [*video_line_ptr],y     ; 1c06 -> 1c08 -> 1c0a r y=6d..93,02
        sta     [*video_line_ptr],y     ; 1c08 -> 1c0a -> 1c0c r y=6d..93,02
@@ -347,7 +349,7 @@
        lda     #0x00                   ; 1c12 -> 1c14 -> 1c16 r
        sta     object1080_onscreen - 0x10,x ; 1c14 -> 1c16 -> 1c19 r x=14..77
        lda     object1080_onscreen_x0 - 0x10,x ; 1c16 -> 1c19 -> 1c1c r x=14..77
-@@ -2562,8 +2671,14 @@
+@@ -2562,8 +2673,14 @@
        stx     *x_save                 ; 1c2d -> 1c30 -> 1c32 r
        bne     3$                      ; 1c30 -> 1c32 -> 1c34,1c6a r z=0..1
        lda     object1080_onscreen_shape_ptr_lo - 0x10,x ; 1c32 -> 1c34 -> 1c37 r x=14..77
@@ -362,7 +364,7 @@
        sta     2$ + 1                  ; 1c3a -> 1c3d -> 1c40 r
        ldx     #0x00                   ; 1c3d -> 1c40 -> 1c42 r
        ldy     *draw_y                 ; 1c40 -> 1c42 -> 1c44 r
-@@ -2572,7 +2687,18 @@
+@@ -2572,7 +2689,18 @@
        lda     video_line_table_hi - 0x20,y ; 1c47 -> 1c49 -> 1c4c r y=28..cf
        sta     *video_line_ptr + 1     ; 1c49 -> 1c4c -> 1c4e r
        ldy     *draw_x0                ; 1c4c -> 1c4e -> 1c50 r
@@ -382,7 +384,7 @@
  2$:   .dw     shape_12_exhaust0 + 6   ; 1c51 rw
        eor     #0xff                   ; 1c50 -> 1c53 -> 1c55 r
        and     [*video_line_ptr],y     ; 1c53 -> 1c55 -> 1c57 r y=6c..93
-@@ -2588,14 +2714,23 @@
+@@ -2588,14 +2716,23 @@
        ldx     *x_save                 ; 1c65 -> 1c67 -> 1c69 r
        rts                             ; 1c67 -> 1c69 -> 1076,16a8 r s=f3..f9,02
  3$:   lda     object1080_onscreen_shape_ptr_lo - 0x10,x ; 1c32 -> 1c6a -> 1c6d r x=14..77
@@ -408,7 +410,7 @@
        sta     *video_line_ptr + 1     ; 1c7f -> 1c82 -> 1c84 r
        ldy     *draw_x0                ; 1c82 -> 1c84 -> 1c86 r
  5$:   lda     *draw_y                 ; 1c84,1ca5 -> 1c86 -> 1c88 r
-@@ -2607,12 +2742,25 @@
+@@ -2607,12 +2744,25 @@
        bcc     7$                      ; 1c90 -> 1c92 -> 1c94,1ca1 r c=0..1
        cpy     *clip_x1                ; 1c92 -> 1c94 -> 1c96 r y=6c..a4
        bcs     7$                      ; 1c94 -> 1c96 -> 1c98,1ca1 r c=0..1
@@ -435,7 +437,7 @@
        iny                             ; 1ca1 -> 1ca2 -> 1ca3 r
        cpy     *draw_x1                ; 1ca2 -> 1ca3 -> 1ca5 r y=5c..a5
        bcc     5$                      ; 1ca3 -> 1ca5 -> 1c86,1ca7 r c=0..1
-@@ -2626,8 +2774,17 @@
+@@ -2626,8 +2776,17 @@
        stx     *x_save                 ; 1db0 -> 1cb2 -> 1cb4 r
        tay                             ; 1cb2 -> 1cb4 -> 1cb5 r
        lda     shape_data_ptr_lo,y     ; 1cb4 -> 1cb5 -> 1cb8 r y=16..ff
@@ -453,7 +455,7 @@
        sta     3$ + 1                  ; 1cbb -> 1cbe -> 1cc1 r
        lda     shape_width_bytes,y     ; 1cbe -> 1cc1 -> 1cc4 r y=16..ff
        clc                             ; 1cc1 -> 1cc4 -> 1cc5 r
-@@ -2636,6 +2793,11 @@
+@@ -2636,6 +2795,11 @@
        lda     *draw_x0                ; 1cc7 -> 1cc9 -> 1ccb r
        lsr     a                       ; 1cc9 -> 1ccb -> 1ccc r
        bcc     0$                      ; 1ccb -> 1ccc -> 1cce,1cd4 r c=0..1
@@ -465,7 +467,7 @@
        lda     *draw_misc_mask         ; 1ccc -> 1cce -> 1cd0 r
        eor     *draw_misc_mask_xor     ; 1cce -> 1cd0 -> 1cd2 r
        sta     *draw_misc_mask         ; 1cd0 -> 1cd2 -> 1cd4 r
-@@ -2651,6 +2813,10 @@
+@@ -2651,6 +2815,10 @@
        lda     video_line_table_hi,y   ; 1ce5 -> 1ce7 -> 1cea r y=00..bc
        adc     #0x00                   ; 1ce7 -> 1cea -> 1cec r c=0..1 d=0
        sta     *video_line_ptr + 1     ; 1cea -> 1cec -> 1cee r
@@ -476,7 +478,7 @@
        lda     *draw_misc_mask         ; 1cec -> 1cee -> 1cf0 r
        sta     *draw_misc_mask_temp    ; 1cee -> 1cf0 -> 1cf2 r
        ldy     *draw_x0                ; 1cf0 -> 1cf2 -> 1cf4 r
-@@ -2659,13 +2825,30 @@
+@@ -2659,13 +2827,30 @@
        bcs     4$                      ; 1cf6 -> 1cf8 -> 1cfa r c=0
        cpy     #0x28                   ; 1cf8 -> 1cfa -> 1cfc r y=00..2d
        bcs     4$                      ; 1cfa -> 1cfc -> 1cfe,1d05 r c=0..1
@@ -508,7 +510,7 @@
        inx                             ; 1d09 -> 1d0b -> 1d0c r
        iny                             ; 1d0b -> 1d0c -> 1d0d r
        cpy     *draw_x1                ; 1d0c -> 1d0d -> 1d0f r y=01..2e
-@@ -2686,7 +2869,7 @@
+@@ -2686,7 +2871,7 @@
        asl     a                       ; 1d23 -> 1d24 -> 1d25 r
        sta     *draw_misc_ptr          ; 1d24 -> 1d25 -> 1d27 r
        lda     #0x00                   ; 1d25 -> 1d27 -> 1d29 r
@@ -517,7 +519,7 @@
        sta     *draw_misc_ptr + 1      ; 1d29 -> 1d2b -> 1d2d r
        lda     *half_dimension         ; 1d2b -> 1d2d -> 1d2f r
        lsr     a                       ; 1d2d -> 1d2f -> 1d30 r
-@@ -2695,6 +2878,12 @@
+@@ -2695,6 +2880,12 @@
        lsr     a                       ; 1d31 -> 1d32 -> 1d33 r
        lsr     a                       ; 1d32 -> 1d33 -> 1d34 r
        tay                             ; 1d33 -> 1d34 -> 1d35 r
@@ -530,7 +532,7 @@
        lda     draw_misc_mask_table,y  ; 1d34 -> 1d35 -> 1d38 r y=00..06
        sta     *draw_misc_mask         ; 1d35 -> 1d38 -> 1d3a r
        lda     draw_misc_mask_xor_table,y ; 1d38 -> 1d3a -> 1d3d r y=00..06
-@@ -2771,6 +2960,62 @@
+@@ -2771,6 +2962,62 @@
        ldy     *draw_misc_y_save       ; 1d1b -> 1db3 -> 1db5 r
  rts_1db5:
        rts                             ; 1da1,1db3 -> 1db5 -> 1076,1d61,1d7d,1d82,1d87 r s=ee..f7
@@ -593,7 +595,7 @@
  draw_misc_mask_table:
        .db     0xff                    ; 1db6 r
        .db     0x00                    ; 1db7 r
-@@ -2781,72 +3026,18 @@
+@@ -2781,72 +3028,18 @@
        .db     0xd5                    ; 1dbc r
        .db     0xff                    ; 1dbd r
  draw_misc_mask_xor_table:
@@ -678,7 +680,7 @@
  sub_1e00:
        jmp     loc_1e2a                ; 15dc -> 1e00 -> 1e2a r
  test_player_fire:
-@@ -3005,77 +3196,8 @@
+@@ -3005,77 +3198,8 @@
        adc     #0x01                   ; 1f32 -> 1f33 -> 1f35 r c=0 d=0
        sta     object1080_velocity_x_hi + 0x50 ; 1f33 -> 1f35 -> 1f38 r
        rts                             ; 1f35 -> 1f38 -> 15df r s=f9
@@ -758,7 +760,7 @@
  barr_1f80:
        .db     0x43                    ; 1f80 r
        .db     0x02                    ; 1f81 r
-@@ -3212,9 +3334,20 @@
+@@ -3212,9 +3336,20 @@
        .db     0x00                    ; 1ffd r
        .db     0x00                    ; 1ffe r
        .db     0x00                    ; 1fff r
@@ -780,7 +782,7 @@
  shape_data_ptr_lo:
        .db     <shape_23_bomb3 + 0x28  ; 4000 r
        .db     <shape_23_bomb3 + 0x28  ; 4001 r
-@@ -4757,6 +4890,9 @@
+@@ -4757,6 +4892,9 @@
        .db     0x01                    ; 45fd r
        .db     0x01                    ; 45fe r
        .db     0x04                    ; 45ff r
@@ -790,7 +792,7 @@
  draw_misc_table:
        .db     0x01                    ; 4600 r
        .db     0x07                    ; 4601 r
-@@ -9432,6 +9568,15 @@
+@@ -9432,6 +9570,15 @@
        .dw     0x0000                  ; 5bfa r
        .dw     0x0000                  ; 5bfc r
        .dw     0x0000                  ; 5bfe r
@@ -806,7 +808,7 @@
  shape_20_bomb0:
        .db     0x5c                    ; 5c00 r
        .db     0x02                    ; 5c01 r
-@@ -21852,510 +21997,12 @@
+@@ -21852,510 +21999,12 @@
        .db     0xe0                    ; 8c05 r
        .db     0x83                    ; 8c06 r
        .db     0x9e                    ; 8c07 r
@@ -1323,7 +1325,7 @@
  microcode_table_5560_data_8e00:
        .db     0x30                    ; 8e00 r
        .db     0x0f                    ; 8e01
-@@ -26926,33 +26573,156 @@
+@@ -26926,33 +26575,156 @@
        .db     0x7c                    ; 9dea
        .db     0x98                    ; 9deb
        .db     0x00                    ; 9dec

diff --git a/loader/a2_bin2hex.py b/loader/a2_bin2hex.py
new file mode 100755 (executable)
index 0000000..a88a0ae
--- /dev/null
+++ b/loader/a2_bin2hex.py
@@ -0,0 +1,26 @@
+#!/usr/bin/env python3
+
+import sys
+from intelhex import IntelHex
+
+EXIT_SUCCESS = 0
+EXIT_FAILURE = 1
+
+if len(sys.argv) < 3:
+  print(f'usage: {sys.argv[0]:s} in.a2bin out.ihx')
+  sys.exit(EXIT_FAILURE)
+in_a2bin= sys.argv[1]
+out_ihx = sys.argv[2]
+
+with open(in_a2bin, 'rb') as fin:
+  a2bin = list(fin.read())
+  hdr = a2bin[:4]
+  bin = a2bin[4:]
+load_addr = hdr[0] | (hdr[1] << 8)
+load_size = hdr[2] | (hdr[3] << 8)
+assert len(bin) == load_size
+
+intelhex = IntelHex()
+#intelhex.start_addr = {'EIP': load_addr}
+intelhex.frombytes(bytes(bin), load_addr)
+intelhex.write_hex_file(out_ihx)

diff --git a/disasm/a2_hex2bin.py b/loader/a2_hex2bin.py
similarity index 100%
rename from disasm/a2_hex2bin.py
rename to loader/a2_hex2bin.py

diff --git a/loader/a2_load.py b/loader/a2_load.py
index 6d87654..1da1a1b 100755 (executable)
--- a/loader/a2_load.py
+++ b/loader/a2_load.py
@@ -34,6 +34,7 @@ with open(in_a2bin, 'rb') as fin:
   bin = a2bin[4:]
 load_addr = hdr[0] | (hdr[1] << 8)
 load_size = hdr[2] | (hdr[3] << 8)
+assert len(bin) == load_size
 
 mem = [0] * 0x10000
 mem_used = [False] * 0x10000