YourWishes/jerryscript
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move Jerry's libc to jerry-libc directory.

Browse Source
This commit is contained in:
Ruben Ayrapetyan
2015-02-11 21:33:45 +03:00
parent 6dfade808f
commit af77eac8e4
13 changed files with 16 additions and 217 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+16 -11
View File
@@ -257,20 +257,21 @@ project (Jerry CXX C ASM)
src/ecma/operations
src/parser/collections
src/parser/js
plugins/lib-device-stm
src/jrt)
src/jrt
jerry-libc
plugins/lib-device-stm)
# Platform-specific
# Linux
set(INCLUDE_CORE_LINUX
src/jrt/target/linux)
jerry-libc/target/linux)
# MCU
# STM32F3
set(INCLUDE_CORE_MCU_STM32F3
src/jrt/target/stm32f3)
jerry-libc/target/stm32f3)
# STM32F4
set(INCLUDE_CORE_MCU_STM32F4
src/jrt/target/stm32f4)
jerry-libc/target/stm32f4)
# Third-party
# Valgrind
@@ -307,6 +308,9 @@ project (Jerry CXX C ASM)
file(GLOB SOURCE_CORE_PARSER_JS src/parser/js/*.cpp)
file(GLOB SOURCE_CORE_JRT src/jrt/*.cpp)
# libc
file(GLOB SOURCE_JERRY_LIBC jerry-libc/*.cpp)
# Plugins
file(GLOB SOURCE_PLUGINS_LIB_DEVICE_STM plugins/lib-device-stm/*.cpp)
@@ -320,6 +324,7 @@ project (Jerry CXX C ASM)
${SOURCE_CORE_PARSER_COLLECTIONS}
${SOURCE_CORE_PARSER_JS}
${SOURCE_CORE_JRT}
${SOURCE_JERRY_LIBC}
${SOURCE_PLUGINS_LIB_DEVICE_STM})
# Platform-specific
@@ -327,15 +332,15 @@ project (Jerry CXX C ASM)
# Jerry standalone
set(SOURCE_JERRY_STANDALONE_MAIN_LINUX src/main_linux.cpp)
file(GLOB SOURCE_CORE_JRT_LINUX src/jrt/target/linux/*.cpp src/jrt/target/linux/*.S)
file(GLOB SOURCE_JERRY_LIBC_LINUX jerry-libc/target/linux/*.cpp jerry-libc/target/linux/*.S)
# MCU
# Jerry standalone
set(SOURCE_JERRY_STANDALONE_MAIN_MCU src/main_mcu.cpp)
# stm32f3
file(GLOB SOURCE_CORE_JRT_STM32F3 src/jrt/target/stm32f3/*.cpp src/jrt/target/stm32f3/*.S)
file(GLOB SOURCE_JERRY_LIBC_STM32F3 jerry-libc/target/stm32f3/*.cpp jerry-libc/target/stm32f3/*.S)
# stm32f4
file(GLOB SOURCE_CORE_JRT_STM32F4 src/jrt/target/stm32f4/*.cpp src/jrt/target/stm32f4/*.S)
file(GLOB SOURCE_JERRY_LIBC_STM32F4 jerry-libc/target/stm32f4/*.cpp jerry-libc/target/stm32f4/*.S)
# Third-party
# Platform-specific
@@ -410,7 +415,7 @@ project (Jerry CXX C ASM)
set(INCLUDE_CORE ${INCLUDE_CORE} ${${MODIFIER_INCLUDE_${MODIFIER}}})
endforeach()
add_library(${TARGET_NAME}.lib STATIC ${SOURCE_CORE} ${SOURCE_CORE_JRT_LINUX})
add_library(${TARGET_NAME}.lib STATIC ${SOURCE_CORE} ${SOURCE_JERRY_LIBC_LINUX})
target_compile_options(${TARGET_NAME}.lib PRIVATE ${CXX_FLAGS_JERRY} ${CXX_FLAGS_COMMON_ARCH} ${CXX_FLAGS_COMMON_${BUILD_MODE}})
target_compile_definitions(${TARGET_NAME}.lib PRIVATE ${DEFINES_JERRY})
target_include_directories(${TARGET_NAME}.lib PRIVATE ${INCLUDE_CORE})
@@ -451,7 +456,7 @@ project (Jerry CXX C ASM)
# Unit tests declaration
add_custom_target(unittests)
add_library(unit_tests.lib STATIC ${SOURCE_CORE} ${SOURCE_CORE_JRT_LINUX})
add_library(unit_tests.lib STATIC ${SOURCE_CORE} ${SOURCE_JERRY_LIBC_LINUX})
target_compile_options(unit_tests.lib PRIVATE ${CXX_FLAGS_JERRY} ${CXX_FLAGS_COMMON_ARCH} ${CXX_FLAGS_UNIT_TEST})
target_compile_definitions(unit_tests.lib PRIVATE ${DEFINES_JERRY} ${DEFINES_UNIT_TEST})
target_include_directories(unit_tests.lib PRIVATE ${INCLUDE_CORE} ${INCLUDE_UNIT_TEST})
@@ -498,7 +503,7 @@ project (Jerry CXX C ASM)
set(DEFINES_JERRY_MCU_SCRIPT JERRY_MCU_SCRIPT_HEADER="${MCU_SCRIPT_GENERATED_HEADER}")
# Jerry library
add_library(${TARGET_NAME}.jerry.lib STATIC ${SOURCE_CORE} ${SOURCE_CORE_JRT_${PLATFORM}})
add_library(${TARGET_NAME}.jerry.lib STATIC ${SOURCE_CORE} ${SOURCE_JERRY_LIBC_${PLATFORM}})
target_compile_options(${TARGET_NAME}.jerry.lib PRIVATE
${CXX_FLAGS_JERRY}
${CXX_FLAGS_COMMON_${BUILD_MODE}}
src/jrt/jerry-libc-printf.cpp → jerry-libc/jerry-libc-printf.cpp
View File
src/jrt/jerry-libc.cpp → jerry-libc/jerry-libc.cpp
View File
src/jrt/jerry-libc.h → jerry-libc/jerry-libc.h
View File
src/jrt/target/linux/asm_arm.h → jerry-libc/target/linux/asm_arm.h
View File
src/jrt/target/linux/asm_x64.h → jerry-libc/target/linux/asm_x64.h
View File
src/jrt/target/linux/asm_x86.h → jerry-libc/target/linux/asm_x86.h
View File
src/jrt/target/linux/jerry-asm.S → jerry-libc/target/linux/jerry-asm.S
View File
src/jrt/target/linux/jerry-libc.cpp → jerry-libc/target/linux/jerry-libc.cpp
View File
src/jrt/target/stm32f3/jerry-libc.cpp → jerry-libc/target/stm32f3/jerry-libc.cpp
View File
src/jrt/target/stm32f4/jerry-libc.cpp → jerry-libc/target/stm32f4/jerry-libc.cpp
View File
src/jrt/target/stm32f3/abi.S
-103
View File
@@ -1,103 +0,0 @@
/**
* Runtime ABI for ARM architecture
*/
/**
* long long __aeabi_llsl(long long {r1, r0}, int {r2})
*/
.thumb_func
.global __aeabi_llsl
__aeabi_llsl:
// if (r2 >= 64) goto 2f;
cmp r2, #64
bhs 2f
// if (r2 < 32) goto 1f;
cmp r2, #32
blo 1f
// r1 = (r0 << (r2 - 32));
// r0 = 0;
sub r2, #32
mov r1, r0
lsl r1, r2
mov r0, #0
bx lr
1:
// r1 <<= r2;
lsl r1, r2
// r2 = 32 - r2;
rsb r2, r2, #32
// r1 |= (r0 >> r2);
mov r3, r0
lsr r3, r2
orr r1, r3
// r2 = 32 - r2;
rsb r2, r2, #32
// r0 <<= r2;
lsl r0, r2
bx lr
2:
// r1 = 0;
// r0 = 0;
mov r1, #0
mov r0, #0
bx lr
/**
* long long __aeabi_llsr(long long {r1, r0}, int {r2})
*/
.thumb_func
.global __aeabi_llsr
__aeabi_llsr:
// if (r2 >= 64) goto 2f;
cmp r2, #64
bhs 2f
// if (r2 < 32) goto 1f;
cmp r2, #32
blo 1f
// r0 = (r1 >> (r2 - 32));
// r1 = 0
sub r2, #32
mov r0, r1
lsr r0, r2
mov r1, #0
bx lr
1:
// r0 >>= r2
lsr r0, r2
// r0 |= r1 << (32 - r2)
mov r3, r1
rsb r2, r2, #32
lsl r3, r3, r2
orr r0, r3
rsb r2, r2, #32
// r1 >>= r2
lsr r1, r2
bx lr
2:
// r1 = 0;
// r0 = 0;
mov r1, #0
mov r0, #0
bx lr
src/jrt/target/stm32f4/abi.S
-103
View File
@@ -1,103 +0,0 @@
/**
* Runtime ABI for ARM architecture
*/
/**
* long long __aeabi_llsl(long long {r1, r0}, int {r2})
*/
.thumb_func
.global __aeabi_llsl
__aeabi_llsl:
// if (r2 >= 64) goto 2f;
cmp r2, #64
bhs 2f
// if (r2 < 32) goto 1f;
cmp r2, #32
blo 1f
// r1 = (r0 << (r2 - 32));
// r0 = 0;
sub r2, #32
mov r1, r0
lsl r1, r2
mov r0, #0
bx lr
1:
// r1 <<= r2;
lsl r1, r2
// r2 = 32 - r2;
rsb r2, r2, #32
// r1 |= (r0 >> r2);
mov r3, r0
lsr r3, r2
orr r1, r3
// r2 = 32 - r2;
rsb r2, r2, #32
// r0 <<= r2;
lsl r0, r2
bx lr
2:
// r1 = 0;
// r0 = 0;
mov r1, #0
mov r0, #0
bx lr
/**
* long long __aeabi_llsr(long long {r1, r0}, int {r2})
*/
.thumb_func
.global __aeabi_llsr
__aeabi_llsr:
// if (r2 >= 64) goto 2f;
cmp r2, #64
bhs 2f
// if (r2 < 32) goto 1f;
cmp r2, #32
blo 1f
// r0 = (r1 >> (r2 - 32));
// r1 = 0
sub r2, #32
mov r0, r1
lsr r0, r2
mov r1, #0
bx lr
1:
// r0 >>= r2
lsr r0, r2
// r0 |= r1 << (32 - r2)
mov r3, r1
rsb r2, r2, #32
lsl r3, r3, r2
orr r0, r3
rsb r2, r2, #32
// r1 >>= r2
lsr r1, r2
bx lr
2:
// r1 = 0;
// r0 = 0;
mov r1, #0
mov r0, #0
bx lr