Skip to content

Commit 89af454

Browse files
ckormanyosckormanyos
authored
Merge pull request #633 from ckormanyos/syntax_and_cleanup
Syntax and cleanup
2 parents e457821 + a4ab7e2 commit 89af454

8 files changed

Lines changed: 563 additions & 538 deletions

File tree

‎ref_app/target.vcxproj‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1151,6 +1151,10 @@
11511151
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt0.cpp" />
11521152
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt0_init_ram.cpp" />
11531153
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt1.cpp" />
1154+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Appli\main.cpp" />
1155+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt0.cpp" />
1156+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt0_init_ram.cpp" />
1157+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt1.cpp" />
11541158
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\main.cpp" />
11551159
</ItemGroup>
11561160
<ItemGroup>

‎ref_app/target.vcxproj.filters‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -992,9 +992,10 @@
992992
<ClCompile Include="target\micros\xtensa_esp32_s3\startup\Std\StdLib.cpp">
993993
<Filter>micros\xtensa_esp32_s3\startup\Std</Filter>
994994
</ClCompile>
995-
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt0.cpp">
996-
<Filter>micros\xtensa_esp32_s3_riscv_cop\startup</Filter>
997-
</ClCompile>
995+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Appli\main.cpp" />
996+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt0.cpp" />
997+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt0_init_ram.cpp" />
998+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\from_no_sdk\Code\Startup\crt1.cpp" />
998999
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt0_init_ram.cpp">
9991000
<Filter>micros\xtensa_esp32_s3_riscv_cop\startup</Filter>
10001001
</ClCompile>
@@ -1004,6 +1005,9 @@
10041005
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\main.cpp">
10051006
<Filter>micros\xtensa_esp32_s3_riscv_cop\startup</Filter>
10061007
</ClCompile>
1008+
<ClCompile Include="target\micros\xtensa_esp32_s3_riscv_cop\startup\crt0.cpp">
1009+
<Filter>micros\xtensa_esp32_s3_riscv_cop\startup</Filter>
1010+
</ClCompile>
10071011
</ItemGroup>
10081012
<ItemGroup>
10091013
<Text Include="target\micros\bcm2835_raspi_b\startup\SD_CARD\PiZero\config.txt">

‎ref_app/target/micros/xtensa_esp32_s3/make/xtensa_esp32_s3_flags.gmk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ GCC_PREFIX = xtensa-esp32s3-elf
1515

1616
TGT_SUFFIX = elf
1717

18+
WARN_FLAGS :=
1819

1920
include $(PATH_TGT_MAKE)/$(TGT)_flags_extra.gmk
2021

@@ -33,7 +34,6 @@ TGT_ALLFLAGS = -O1
3334
-fno-stack-protector \
3435
-nostdlib \
3536
-gdwarf-4 \
36-
-ffreestanding \
3737
-DCONFIG_IDF_TARGET_ESP32S3 \
3838
-DI_KNOW_WHAT_I_AM_DOING
3939

@@ -75,7 +75,7 @@ $(PATH_OBJ)/%.o : %.S
7575
# ...and reformat (using sed) any possible error/warning messages
7676
# for the VisualStudio(R) output window,
7777
# ...and create an assembly listing using objdump
78-
@-$(TGT_GCC) -O1 -fno-reorder-blocks-and-partition -fno-reorder-functions -mabi=call0 -mno-text-section-literals -mstrict-align -mlongcalls -fomit-frame-pointer -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -fno-stack-protector -DI_KNOW_WHAT_I_AM_DOING $(DEFS_IEEE754_SF) $(C_INCLUDES) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
78+
@-$(TGT_GCC) -O1 -fno-reorder-blocks-and-partition -fno-reorder-functions -mabi=call0 -mno-text-section-literals -mstrict-align -mlongcalls -fomit-frame-pointer -fstrict-volatile-bitfields -fno-jump-tables -fno-tree-switch-conversion -fno-stack-protector -DI_KNOW_WHAT_I_AM_DOING $(DEFS_IEEE754_SF) $(DEFS_LIB1FUNCS) $(C_INCLUDES) $< -c -o $(PATH_OBJ)/$(basename $(@F)).o 2> $(PATH_ERR)/$(basename $(@F)).err
7979
@-$(SED) -e 's|:\([0-9]*\):|(\1) :|' $(PATH_ERR)/$(basename $(@F)).err
8080
@-$(OBJDUMP) -S $(PATH_OBJ)/$(basename $(@F)).o > $(PATH_LST)/$(basename $(@F)).lst
8181

‎ref_app/target/micros/xtensa_esp32_s3/make/xtensa_esp32_s3_flags_extra.gmk‎

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ SOME_O3_FLAGS += -fgcse-after-reload
6767
SOME_O3_FLAGS += -fipa-cp-clone
6868

6969
DEFS_IEEE754_SF :=
70+
DEFS_IEEE754_SF += -D__XTENSA_CALL0_ABI__=1
7071
DEFS_IEEE754_SF += -DL_divsf3
7172
DEFS_IEEE754_SF += -DL_negsf2
7273
DEFS_IEEE754_SF += -DL_addsubsf3
73-
DEFS_IEEE754_SF += -DL_mulsf3
7474
DEFS_IEEE754_SF += -DL_cmpsf2
7575
DEFS_IEEE754_SF += -DL_fixsfsi
7676
DEFS_IEEE754_SF += -DL_fixsfdi
@@ -81,3 +81,21 @@ DEFS_IEEE754_SF += -DL_floatdisf
8181
DEFS_IEEE754_SF += -DL_sqrtf
8282
DEFS_IEEE754_SF += -DL_recipsf2
8383
DEFS_IEEE754_SF += -DL_rsqrtsf2
84+
85+
DEFS_LIB1FUNCS :=
86+
DEFS_LIB1FUNCS += -DL_ctzsi2
87+
DEFS_LIB1FUNCS += -DL_mulsi3
88+
DEFS_LIB1FUNCS += -DL_umulsidi3
89+
DEFS_LIB1FUNCS += -DL_clz
90+
DEFS_LIB1FUNCS += -DL_clrsbsi2
91+
DEFS_LIB1FUNCS += -DL_clzsi2
92+
DEFS_LIB1FUNCS += -DL_ffssi2
93+
DEFS_LIB1FUNCS += -DL_udivsi3
94+
DEFS_LIB1FUNCS += -DL_divsi3
95+
DEFS_LIB1FUNCS += -DL_umodsi3
96+
DEFS_LIB1FUNCS += -DL_modsi3
97+
DEFS_LIB1FUNCS += -DL_ashldi3
98+
DEFS_LIB1FUNCS += -DL_ashrdi3
99+
DEFS_LIB1FUNCS += -DL_lshrdi3
100+
DEFS_LIB1FUNCS += -DL_bswapsi2
101+
DEFS_LIB1FUNCS += -DL_bswapdi2

‎ref_app/target/micros/xtensa_esp32_s3/startup/Std/StdLib.cpp‎

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
// or copy at http://www.boost.org/LICENSE_1_0.txt)
66
//
77

8-
// Originally from:
8+
// Originally from (but strongly modified from):
99
/******************************************************************************************
1010
Filename : StdLib.c
1111
@@ -19,7 +19,7 @@
1919
2020
Date : 22.02.2025
2121
22-
Description : Handwritten StdLib functions
22+
Description : Hand-written StdLib functions
2323
2424
******************************************************************************************/
2525

@@ -186,7 +186,8 @@ void* memcpy (void* dest, const void* src, size_t n)
186186
const std::uint8_t* s { reinterpret_cast<const uint8_t*>(src) };
187187

188188
// Align destination to the next 32-bit boundary.
189-
while (((uintptr_t) d & 3) && n > 0)
189+
while ( (static_cast<unsigned>(reinterpret_cast<std::uintptr_t>(d) & unsigned { UINT8_C(3) }) != 0U)
190+
&& (n > std::size_t { UINT8_C(0) }))
190191
{
191192
*d++ = *s++;
192193

@@ -198,19 +199,19 @@ void* memcpy (void* dest, const void* src, size_t n)
198199
std::uint32_t* d32 { reinterpret_cast<std::uint32_t*>(d) };
199200
const std::uint32_t* s32 { reinterpret_cast<const uint32_t*>(s) };
200201

201-
while (n >= 4)
202+
while (n >= std::size_t { UINT8_C(4) })
202203
{
203204
*d32++ = *s32++;
204205

205-
n -= 4;
206+
n -= std::size_t { UINT8_C(4) };
206207
}
207208

208209
// Handle any remaining bytes.
209210

210211
d = reinterpret_cast<std::uint8_t*>(d32);
211212
s = reinterpret_cast<const uint8_t*>(s32);
212213

213-
while (n > 0)
214+
while (n > std::size_t { UINT8_C(0) })
214215
{
215216
*d++ = *s++;
216217

0 commit comments

Comments
 (0)