fix application support

Author: mateoconlechuga

makefile

@@ -59,7 +59,7 @@ install: all $(addprefix install-,$(SRCS)) $(addprefix install-,$(LIBS))
 	$(Q)$(call COPY,$(call NATIVEPATH,src/linker_script_app.ld),$(INSTALL_META))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/convfont/convfont),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/convimg/bin/convimg),$(INSTALL_BIN))
-	$(Q)$(call COPY,$(call NATIVEEXE,tools/convbin/bin/convbin),$(INSTALL_BIN))
+	#$(Q)$(call COPY,$(call NATIVEEXE,tools/convbin/bin/convbin),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/cedev-config/bin/cedev-config),$(INSTALL_BIN))
 	$(Q)$(call COPY,$(call NATIVEEXE,tools/cedev-obj/bin/cedev-obj),$(INSTALL_BIN))
 	$(Q)$(WINDOWS_COPY)

src/crt/crt0.S

@@ -38,11 +38,13 @@
 	.equ	ti.MovFrOP1, 0x02032C
 	.equ	ti.ClrLCDFull, 0x020808
 
-#if !HAS_APPLICATION
 	.section	.header,"ax",@progbits
 
 	.local	__header
 __header:
+#if HAS_APPLICATION
+	.db	0x00					; 0x00 is signifier for C applications (also force includes icon/description)
+#else
 	.db	0xEF, 0x7B, 0x00		; 0x00 is signifier for C programs
 #endif
 
@@ -62,14 +64,21 @@ __header:
 	.equ	ti.MemClear, 0x0210DC
 	.equ	ti.ClrTxtShd, 0x020818
 
+	.global	__start
+__start:
 	ld	iy, ti.flags
 	ld	sp, (ti.onSP)			; reset stacks
 	call	ti.ResetStacks
+	ld	bc, ___data_len
+	or	a, a
+    sbc hl, hl
+    adc hl, bc
+	jr	z, .L.skip_data_copy
 	ld	hl, ___data_lma
 	ld	de, ___data_vma
-	ld	bc, ___data_len
-	ldir					; there is always .data, no need for zero check
-	call	__start
+	ldir
+.L.skip_data_copy:
+	call	___app_start
 	ld	de, (ti.asm_prgm_size)
 	ld	hl, ti.userMem
 	call	ti.DelMem
@@ -86,11 +95,13 @@ __header:
 	ldir
 	ld	a, ti.kClear
 	jp	ti.JForceCmd
-#endif
-
+	.local	___app_start
+___app_start:
+#else
 	.global	__start
 __start:
 	ld	iy, ti.flags
+#endif
 
 #if HAS_RUN_PRGM
 	ld	de, ___prgm_caller
@@ -158,6 +169,26 @@ ___libload_libs:
 	call	ti.RunIndicOff			; assumes iy = flags
 	call	ti.usb_DisableTimer
 	di
+
+.L.bss_zeroize:
+	ld	hl, ___bss_len
+	ld	bc, 0
+	xor	a, a
+	sbc	hl, bc
+	jr	z, .L.bss_done
+	ld	de, ___bss_low
+	push	de
+	ld	(de), a
+	dec	hl
+	sbc	hl, bc
+	pop	hl
+	jr	z, .L.bss_done
+	ld	bc, ___bss_len
+	dec	bc
+	inc	de
+	ldir
+.L.bss_done:
+
 	res	1, (iy + 0x0D)			; no text buffer
 	res	3, (iy + 0x4A)			; use first shadow buffer
 	set	5, (iy + 0x4C)			; only display
@@ -250,25 +281,6 @@ ___libload_libs:
 	call	ti.PopRealO1
 #endif
 
-.L.bss_zeroize:
-	ld	hl, ___bss_len
-	ld	bc, 0
-	xor	a, a
-	sbc	hl, bc
-	jr	z, .L.bss_done
-	ld	de, ___bss_low
-	push	de
-	ld	(de), a
-	dec	hl
-	sbc	hl, bc
-	pop	hl
-	jr	z, .L.bss_done
-	ld	bc, ___bss_len
-	dec	bc
-	inc	de
-	ldir
-.L.bss_done:
-
 #if HAS_CLOCK
 	ld	hl, ti.mpTmrCtrl + 1
 	set	ti.bTmr1CountUp - 8, (hl)

src/linker_script.ld

@@ -13,10 +13,12 @@ SECTIONS
         KEEP (*(.header))
         KEEP (*(.header.icon))
     } >prgm
+
     .init :
     {
         *(.init)
     } >prgm
+
     .text :
     {
         *(.text.unlikely .text.*_unlikely .text.unlikely.*)
@@ -27,6 +29,7 @@ SECTIONS
         *(.text .stub .text.* .gnu.linkonce.t.*)
         *(.gnu.warning)
     } >prgm
+
     .rodata :
     {
         *(.rodata .rodata.* .gnu.linkonce.r.*)

src/linker_script_app.ld

@@ -4,20 +4,26 @@ MEMORY
     bss  : ORIGIN = BSSHEAP_LOW, LENGTH = BSSHEAP_HIGH - BSSHEAP_LOW
 }
 
+PHDRS
+{
+    prgm PT_LOAD;
+}
+
 SECTIONS
 {
     . = LOAD_ADDR;
 
     .header :
     {
         KEEP (*(.header))
+        PROVIDE_HIDDEN (___icon_optional = .);
         KEEP (*(.header.icon))
-    } >prgm
+    } >prgm :prgm
 
     .init :
     {
         *(.init)
-    } >prgm
+    } >prgm :prgm
 
     .text :
     {
@@ -28,12 +34,12 @@ SECTIONS
         *(SORT(.text.sorted.*))
         *(.text .stub .text.* .gnu.linkonce.t.*)
         *(.gnu.warning)
-    } >prgm
+    } >prgm :prgm
 
     .rodata :
     {
         *(.rodata .rodata.* .gnu.linkonce.r.*)
-    } >prgm
+    } >prgm :prgm
 
     .init_array :
     {
@@ -42,15 +48,15 @@ SECTIONS
         KEEP (*(SORT_BY_INIT_PRIORITY(.init_array.*)))
         KEEP (*(.init_array))
         PROVIDE_HIDDEN (__init_array_end = .);
-    } >prgm
+    } >prgm :prgm
 
     .fini_array :
     {
         PROVIDE_HIDDEN (__fini_array_start = .);
         KEEP (*(SORT_BY_INIT_PRIORITY(.fini_array.*)))
         KEEP (*(.fini_array))
         PROVIDE_HIDDEN (__fini_array_end = .);
-    } >prgm
+    } >prgm :prgm
 
     .data :
     {
@@ -59,7 +65,7 @@ SECTIONS
         SORT(CONSTRUCTORS)
         *(.data1)
         ___data_vma_end = .;
-    } >bss AT>prgm
+    } >bss AT>prgm :prgm
     ___data_lma = LOADADDR(.data);
     ___data_len = ___data_vma_end - ___data_vma;
 
@@ -70,7 +76,7 @@ SECTIONS
         *(.bss .bss.* .gnu.linkonce.b.*)
         *(COMMON)
         ___bss_high = .;
-    } >bss
+    } >bss :NONE
     ___bss_len = ___bss_high - ___bss_low;
 
     ASSERT(. <= BSSHEAP_HIGH, "Error: BSS exceed BSSHEAP_HIGH limit")