new branch - CHDK : Elf Edition - Developers wanted - page 32 - General Discussion and Assistance

reyalp

12593

Re: new branch - CHDK : Elf Edition - Developers wanted

« Reply #310 on: 12 / June / 2019, 02:22:37 »

Advertisements

Quote from: philmoz on 11 / June / 2019, 04:42:58

This also appears to fix both the G12 and G5X.

That seems like a good approach to me. Fixes both opening text files and running modules from filebrowser for me on sx160

Logged

Don't forget what the H stands for.

srsa_4c

4230

Re: new branch - CHDK : Elf Edition - Developers wanted

« Reply #311 on: 12 / June / 2019, 18:40:33 »

Quote from: reyalp on 12 / June / 2019, 02:22:37

Quote from: philmoz on 11 / June / 2019, 04:42:58
This also appears to fix both the G12 and G5X.
That seems like a good approach to me. Fixes both opening text files and running modules from filebrowser for me on sx160

I only tried text files, but there's no more crash/blank screen here either.

Somewhat unrelated, one of my cams happened to have a file with a special size, shown incorrectly in the size column. Filesize in bytes also visible on the attached screenshot.

filesize.png (7.32 kB, 360x270 - viewed 28 times.)

Logged

Menu jumping/flickering on M10?

philmoz

3156

Re: new branch - CHDK : Elf Edition - Developers wanted

« Reply #312 on: 12 / June / 2019, 20:57:39 »

Quote from: srsa_4c on 12 / June / 2019, 18:40:33

Quote from: reyalp on 12 / June / 2019, 02:22:37
Quote from: philmoz on 11 / June / 2019, 04:42:58
This also appears to fix both the G12 and G5X.
That seems like a good approach to me. Fixes both opening text files and running modules from filebrowser for me on sx160
I only tried text files, but there's no more crash/blank screen here either.

Thanks, I'll check this in later.

Quote

Somewhat unrelated, one of my cams happened to have a file with a special size, shown incorrectly in the size column. Filesize in bytes also visible on the attached screenshot.

I thought we'd squashed the size issues - do you know the actual size in bytes that caused this?

Logged

CHDK ports:
sx30is (1.00c, 1.00h, 1.00l, 1.00n & 1.00p)
g12 (1.00c, 1.00e, 1.00f & 1.00g)
sx130is (1.01d & 1.01f)
ixus310hs (1.00a & 1.01a)
sx40hs (1.00d, 1.00g & 1.00i)
g1x (1.00e, 1.00f & 1.00g)
g5x (1.00c, 1.01a, 1.01b)

srsa_4c

4230

Re: new branch - CHDK : Elf Edition - Developers wanted

« Reply #313 on: 18 / April / 2020, 15:40:51 »

I'd like to differentiate thumb2 D6 and D7 modules, to prevent D6 modules from crashing D7 cameras. My proposal would be this:

Code: [Select]

Index: arm_rules.inc
===================================================================
--- arm_rules.inc (revision 5467)
+++ arm_rules.inc (working copy)
@@ -162,10 +162,18 @@
         CFLAGS+=-DOPT_ARCHITECTURE=GCC_ELF_THUMB
     endif
 else
-    ifdef OPT_USE_GCC_EABI
-        CFLAGS+=-DOPT_ARCHITECTURE=GCC_EABI_THUMB2
+    ifdef DIGIC7
+        ifdef OPT_USE_GCC_EABI
+            CFLAGS+=-DOPT_ARCHITECTURE=GCC_EABI_THUMB2A
+        else
+            CFLAGS+=-DOPT_ARCHITECTURE=GCC_ELF_THUMB2A
+        endif
     else
-        CFLAGS+=-DOPT_ARCHITECTURE=GCC_ELF_THUMB2
+        ifdef OPT_USE_GCC_EABI
+            CFLAGS+=-DOPT_ARCHITECTURE=GCC_EABI_THUMB2
+        else
+            CFLAGS+=-DOPT_ARCHITECTURE=GCC_ELF_THUMB2
+        endif
     endif
 endif
 

Index: modules/flt.h
===================================================================
--- modules/flt.h (revision 5467)
+++ modules/flt.h (working copy)
@@ -23,8 +23,10 @@
 // Architecture of build (GCC ABI, thumb/thumb2, etc)
 #define GCC_ELF_THUMB               1
 #define GCC_EABI_THUMB              2
-#define GCC_ELF_THUMB2           0x11   // unlikely variant
-#define GCC_EABI_THUMB2          0x12
+#define GCC_ELF_THUMB2           0x11   // Cortex R, unlikely variant
+#define GCC_EABI_THUMB2          0x12   // Cortex R
+#define GCC_ELF_THUMB2A          0x21   // Cortex A, unlikely variant
+#define GCC_EABI_THUMB2A         0x22   // Cortex A
 
 // Base module interface - once loaded into memory and any relocations done these
 // functions provide the minimum interface to run the module code.