-; Offsets into the o65 header structure (6502 format)
-O65_HDR_MARKER = 0 ; Non-C64 marker
-O65_HDR_MAGIC = 2 ; o65 magic
-O65_HDR_VERSION = 5 ; Version number
-O65_HDR_MODE = 6 ; Mode word
-O65_HDR_TBASE = 8 ; Original text (code) segment address
-O65_HDR_TLEN = 10 ; Size of text (code) segment
-O65_HDR_DBASE = 12 ; Original data segment address
-O65_HDR_DLEN = 14 ; Size of data segment
-O65_HDR_BBASE = 16 ; Original bss segment address
-O65_HDR_BLEN = 18 ; Size of bss segment
-O65_HDR_ZBASE = 20 ; Original zp segment address
-O65_HDR_ZLEN = 22 ; Size of zp segment
-O65_HDR_STACK = 24 ; Stacksize needed
-O65_HDR_SIZE = 26 ; Size of header structure
+; The o65 header structure (6502 format)
+.struct O65_HDR
+ MARKER .byte 2 ; Non-C64 marker: $01 $00
+ MAGIC .byte 3 ; o65 magic: "o65"
+ VERSION .byte 1 ; Version number
+ MODE .word ; Mode word
+ TBASE .word ; Original text (code) segment address
+ TLEN .word ; Size of text (code) segment
+ DBASE .word ; Original data segment address
+ DLEN .word ; Size of data segment
+ BBASE .word ; Original bss segment address
+ BLEN .word ; Size of bss segment
+ ZBASE .word ; Original zp segment address
+ ZLEN .word ; Size of zp segment
+ STACK .word ; Stacksize needed
+.endstruct
+
+; Marker, magic and version number
+O65_MARKER_0 = $01
+O65_MARKER_1 = $00
+O65_MAGIC_0 = $6F ; 'o'
+O65_MAGIC_1 = $36 ; '6'
+O65_MAGIC_2 = $35 ; '5'
+O65_VERSION = $00
; Defines for the mode word
O65_CPU_65816 = $8000 ; Executable is for 65816
O65_SIZE_16BIT = $0000 ; All size words are 16bit
O65_SIZE_MASK = $2000 ; Mask to extract size
+O65_FTYPE_OBJ = $1000 ; Object file
+O65_FTYPE_EXE = $0000 ; Executable file
+O65_FTYPE_MASK = $1000 ; Mask to extract type
+
+O65_ADDR_SIMPLE = $0800 ; Simple addressing
+O65_ADDR_DEFAULT = $0000 ; Default addressing
+O65_ADDR_MASK = $0800 ; Mask to extract addressing
+
O65_ALIGN_1 = $0000 ; Bytewise alignment
O65_ALIGN_2 = $0001 ; Align words
O65_ALIGN_4 = $0002 ; Align longwords
O65_ALIGN_256 = $0003 ; Align pages (256 bytes)
O65_ALIGN_MASK = $0003 ; Mask to extract alignment
-; The o65 segment types
-O65_SEG_UNDEF = $00
-O65_SEG_ABS = $01
-O65_SEG_TEXT = $02
-O65_SEG_DATA = $03
-O65_SEG_BSS = $04
-O65_SEG_ZP = $05
+; The mode word as generated by the ld65 linker
+O65_MODE_CC65 = O65_CPU_6502 | O65_RELOC_BYTE | O65_SIZE_16BIT | O65_FTYPE_EXE | O65_ADDR_SIMPLE | O65_ALIGN_1
; Relocation type codes
O65_RTYPE_WORD = $80
; Operating system codes for O65_OPT_OS
O65_OS_OSA65 = 1
O65_OS_LUNIX = 2
-O65_OS_CC65_MODULE = 3
+O65_OS_CC65 = 3
+O65_OS_OPENCBM = 4
; Load errors
O65_LOAD_OK = 0 ; Module load successful