diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 6b8bc5f1..a6cffbdd 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -21,7 +21,6 @@ jobs: - name: Build the project run: | make PLATFORM=${{ matrix.platform }} create_context - wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/Library/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -O ./arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/main.c -O ./arch/cortex-m23/m2351/src/NuBL2/main.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/VerifyNuBL3x.c -O ./arch/cortex-m23/m2351/src/NuBL2/VerifyNuBL3x.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/NuBL2.h -O ./arch/cortex-m23/m2351/src/NuBL2/NuBL2.h diff --git a/.github/workflows/codeql.yml b/.github/workflows/codeql.yml index 4a1fdaf2..a6cd3cf1 100644 --- a/.github/workflows/codeql.yml +++ b/.github/workflows/codeql.yml @@ -82,7 +82,6 @@ jobs: - name: Build the project run: | make PLATFORM=numaker_pfm_m2351 create_context - wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/Library/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -O ./arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/main.c -O ./arch/cortex-m23/m2351/src/NuBL2/main.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/VerifyNuBL3x.c -O ./arch/cortex-m23/m2351/src/NuBL2/VerifyNuBL3x.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/NuBL2.h -O ./arch/cortex-m23/m2351/src/NuBL2/NuBL2.h diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 4a62961f..1d9dd7b0 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -34,7 +34,6 @@ jobs: - name: Build the project run: | make PLATFORM=numaker_pfm_m2351 create_context - wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/Library/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -O ./arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/main.c -O ./arch/cortex-m23/m2351/src/NuBL2/main.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/VerifyNuBL3x.c -O ./arch/cortex-m23/m2351/src/NuBL2/VerifyNuBL3x.c wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/NuBL2.h -O ./arch/cortex-m23/m2351/src/NuBL2/NuBL2.h diff --git a/COPYING b/COPYING index e806951f..a4f46800 100644 --- a/COPYING +++ b/COPYING @@ -282,12 +282,6 @@ valid. * Copyright (C) 2017 Nuvoton Technology Corp. All rights reserved. */ -arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -// This file is part of the uOS++ III distribution -// Parts of this file are from the newlib sources, issued under GPL. -// Copyright (c) 2014 Liviu Ionescu - arch/cortex-m23/m2351/src/Device/ arch/cortex-m23/m2351/src/StdDriver/ ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/ReleaseNotes b/ReleaseNotes deleted file mode 100644 index e329cc0c..00000000 --- a/ReleaseNotes +++ /dev/null @@ -1,58 +0,0 @@ -mTower Release Notes -+=================== - -This file contains are the release notes for the mTower for every release. -The text is just as it was written at the time of release. - -Repository contains 3 branches: - -* trustzone-basic-app - a simple bare-metal application consisting of -interacting secure- and normal-world parts. Can be used as a template for -creating other applications or just to simplify understanding of secure apps. - -* nFreeRTOS-basic - normal-world part operates under FreeRTOS operating system, -can be used as starting point for implementing custom secure apps. - -* master - primary development branch. Uses FreeRTOS in normal-world part; -over time will be filled with GlobalPlatform spec compliant TrustZone -components. - -mTower 0.1.0 ------------- - -This is the initial version. It includes the complete mTower with support for -the arm cortex-m23 architectures. - -Architecture support: - arm - NuMaker-PFM-M2351 - -* using FreeRTOS as normal-world resource manager -* support of GP TEE Client API (except shared memory support) -* pseudo-TAs support (built-in TAs that are parts of single binary image) -* two examples are included (HelloWorld and template application) - -mTower 0.2.0 - -* Added files of JOSS article -* Ported hotp example from OP-TEE -* Enhanced documentation -* Added GP TEE test suite -* Added HW security exception example -* Clarified licensing terms -* Refactored parts of source code -* Fixed bug related to incorrect parameter passing between Normal and Secure - Worlds - -mTower 0.3.0 - -* Added Peripheral Secure Attribution Configuration -* Added support for M2351-Badge by Samsung R&D Institute Ukraine (SRK) -* Added secure/non-secure debug UART configuration -* Added configuration menu option to enable/disable Spy app -* Added configuration mechanism for selecting output file format -* Shifted NSC area to main code (NSC area address is dynamically calculated) -* Added Trusted boot configuration options - -Work in progress ----------------- - diff --git a/apps/aes/ca/aes_ns.c b/apps/aes/ca/aes_ns.c index f34b227e..47c92fd0 100644 --- a/apps/aes/ca/aes_ns.c +++ b/apps/aes/ca/aes_ns.c @@ -29,6 +29,8 @@ #include #include +#include "printf.h" + /* OP-TEE TEE client API (built by optee_client) */ #include diff --git a/apps/hello_world/ca/hello_world_ns.c b/apps/hello_world/ca/hello_world_ns.c index 7e1af7f5..65265ca2 100644 --- a/apps/hello_world/ca/hello_world_ns.c +++ b/apps/hello_world/ca/hello_world_ns.c @@ -29,6 +29,8 @@ #include #include +#include "printf.h" + #include "tee_client_api.h" /* To the the UUID (found the the TA's h-file(s)) */ diff --git a/apps/hotp/ca/hotp_ns.c b/apps/hotp/ca/hotp_ns.c index 4d687f6f..155a990a 100644 --- a/apps/hotp/ca/hotp_ns.c +++ b/apps/hotp/ca/hotp_ns.c @@ -9,6 +9,8 @@ #include #include +#include "printf.h" + /* OP-TEE TEE client API (built by optee_client) */ #include diff --git a/apps/test/ca/test_ns.c b/apps/test/ca/test_ns.c index 2f4d3c90..134d4d96 100644 --- a/apps/test/ca/test_ns.c +++ b/apps/test/ca/test_ns.c @@ -29,6 +29,8 @@ #include #include +#include "printf.h" + /* OP-TEE TEE client API (built by optee_client) */ #include diff --git a/arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/system_M2351.c b/arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/system_M2351.c index aac82444..513eb50b 100644 --- a/arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/system_M2351.c +++ b/arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/system_M2351.c @@ -16,6 +16,8 @@ #include #include "NuMicro.h" +#include "printf.h" + #if defined (__ARM_FEATURE_CMSE) && (__ARM_FEATURE_CMSE == 3U) #include "partition_M2351.h" extern void SCU_IRQHandler(void); diff --git a/arch/cortex-m23/m2351/src/NuBL2/Make.defs b/arch/cortex-m23/m2351/src/NuBL2/Make.defs index 77d2679c..053f6096 100644 --- a/arch/cortex-m23/m2351/src/NuBL2/Make.defs +++ b/arch/cortex-m23/m2351/src/NuBL2/Make.defs @@ -35,8 +35,6 @@ CHIP_ASRCS_S = ../Device/Nuvoton/M2351/Source/GCC/startup_M2351.S \ KeyInfo/NuBL3xKeyStorage.S CHIP_CSRCS_S = ../Device/Nuvoton/M2351/Source/system_M2351.c \ - ../Device/Nuvoton/M2351/Source/GCC/_syscalls.c \ main.c \ VerifyNuBL3x.c \ FwInfo.c - diff --git a/arch/cortex-m23/m2351/src/StdDriver/inc/printf.h b/arch/cortex-m23/m2351/src/StdDriver/inc/printf.h new file mode 100644 index 00000000..1e3e2794 --- /dev/null +++ b/arch/cortex-m23/m2351/src/StdDriver/inc/printf.h @@ -0,0 +1,121 @@ +/////////////////////////////////////////////////////////////////////////////// +// \author (c) Marco Paland (info@paland.com) +// 2014-2019, PALANDesign Hannover, Germany +// +// \license The MIT License (MIT) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +// \brief Tiny printf, sprintf and snprintf implementation, optimized for speed on +// embedded systems with a very limited resources. +// Use this instead of bloated standard/newlib printf. +// These routines are thread safe and reentrant. +// +/////////////////////////////////////////////////////////////////////////////// + +#ifndef _PRINTF_H_ +#define _PRINTF_H_ + +#include +#include + + +#ifdef __cplusplus +extern "C" { +#endif + + +/** + * Output a character to a custom device like UART, used by the printf() function + * This function is declared here only. You have to write your custom implementation somewhere + * \param character Character to output + */ +// #ifdef C_SECURE_CODE +// void __putchar(char character); +// #else +void _putchar(char character); +// #endif + + +/** + * Tiny printf implementation + * You have to implement _putchar if you use printf() + * To avoid conflicts with the regular printf() API it is overridden by macro defines + * and internal underscore-appended functions like printf_() are used + * \param format A string that specifies the format of the output + * \return The number of characters that are written into the array, not counting the terminating null character + */ +#define printf printf_ +int printf_(const char* format, ...); + + +/** + * Tiny sprintf implementation + * Due to security reasons (buffer overflow) YOU SHOULD CONSIDER USING (V)SNPRINTF INSTEAD! + * \param buffer A pointer to the buffer where to store the formatted string. MUST be big enough to store the output! + * \param format A string that specifies the format of the output + * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character + */ +#define sprintf sprintf_ +int sprintf_(char* buffer, const char* format, ...); + + +/** + * Tiny snprintf/vsnprintf implementation + * \param buffer A pointer to the buffer where to store the formatted string + * \param count The maximum number of characters to store in the buffer, including a terminating null character + * \param format A string that specifies the format of the output + * \param va A value identifying a variable arguments list + * \return The number of characters that COULD have been written into the buffer, not counting the terminating + * null character. A value equal or larger than count indicates truncation. Only when the returned value + * is non-negative and less than count, the string has been completely written. + */ +#define snprintf snprintf_ +#define vsnprintf vsnprintf_ +int snprintf_(char* buffer, size_t count, const char* format, ...); +int vsnprintf_(char* buffer, size_t count, const char* format, va_list va); + + +/** + * Tiny vprintf implementation + * \param format A string that specifies the format of the output + * \param va A value identifying a variable arguments list + * \return The number of characters that are WRITTEN into the buffer, not counting the terminating null character + */ +#define vprintf vprintf_ +int vprintf_(const char* format, va_list va); + + +/** + * printf with output function + * You may use this as dynamic alternative to printf() with its fixed _putchar() output + * \param out An output function which takes one character and an argument pointer + * \param arg An argument pointer for user data passed to output function + * \param format A string that specifies the format of the output + * \return The number of characters that are sent to the output function, not counting the terminating null character + */ +int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...); + + +#ifdef __cplusplus +} +#endif + + +#endif // _PRINTF_H_ diff --git a/arch/cortex-m23/m2351/src/StdDriver/src/Makefile b/arch/cortex-m23/m2351/src/StdDriver/src/Makefile index cf4c8331..85073d1c 100644 --- a/arch/cortex-m23/m2351/src/StdDriver/src/Makefile +++ b/arch/cortex-m23/m2351/src/StdDriver/src/Makefile @@ -67,6 +67,7 @@ SRCS += uart.c #SRCS += usci_uart.c #SRCS += wdt.c #SRCS += wwdt.c +SRCS += printf.c ifeq ($(WORLD), secure) SRCS += clk.c diff --git a/arch/cortex-m23/m2351/src/StdDriver/src/printf.c b/arch/cortex-m23/m2351/src/StdDriver/src/printf.c new file mode 100644 index 00000000..3f4c3a07 --- /dev/null +++ b/arch/cortex-m23/m2351/src/StdDriver/src/printf.c @@ -0,0 +1,935 @@ +/////////////////////////////////////////////////////////////////////////////// +// \author (c) Marco Paland (info@paland.com) +// 2014-2019, PALANDesign Hannover, Germany +// +// \license The MIT License (MIT) +// +// Permission is hereby granted, free of charge, to any person obtaining a copy +// of this software and associated documentation files (the "Software"), to deal +// in the Software without restriction, including without limitation the rights +// to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +// copies of the Software, and to permit persons to whom the Software is +// furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +// OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN +// THE SOFTWARE. +// +// \brief Tiny printf, sprintf and (v)snprintf implementation, optimized for speed on +// embedded systems with a very limited resources. These routines are thread +// safe and reentrant! +// Use this instead of the bloated standard/newlib printf cause these use +// malloc for printf (and may not be thread safe). +// +/////////////////////////////////////////////////////////////////////////////// + +#include +#include + +#include "printf.h" + + +// define this globally (e.g. gcc -DPRINTF_INCLUDE_CONFIG_H ...) to include the +// printf_config.h header file +// default: undefined +#ifdef PRINTF_INCLUDE_CONFIG_H +#include "printf_config.h" +#endif + + +// 'ntoa' conversion buffer size, this must be big enough to hold one converted +// numeric number including padded zeros (dynamically created on stack) +// default: 32 byte +#ifndef PRINTF_NTOA_BUFFER_SIZE +#define PRINTF_NTOA_BUFFER_SIZE 32U +#endif + +// 'ftoa' conversion buffer size, this must be big enough to hold one converted +// float number including padded zeros (dynamically created on stack) +// default: 32 byte +#ifndef PRINTF_FTOA_BUFFER_SIZE +#define PRINTF_FTOA_BUFFER_SIZE 32U +#endif + +// support for the floating point type (%f) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_FLOAT +#define PRINTF_SUPPORT_FLOAT +#endif + +// support for exponential floating point notation (%e/%g) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_EXPONENTIAL +#define PRINTF_SUPPORT_EXPONENTIAL +#endif + +// define the default floating point precision +// default: 6 digits +#ifndef PRINTF_DEFAULT_FLOAT_PRECISION +#define PRINTF_DEFAULT_FLOAT_PRECISION 6U +#endif + +// define the largest float suitable to print with %f +// default: 1e9 +#ifndef PRINTF_MAX_FLOAT +#define PRINTF_MAX_FLOAT 1e9 +#endif + +// support for the long long types (%llu or %p) +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_LONG_LONG +#define PRINTF_SUPPORT_LONG_LONG +#endif + +// support for the ptrdiff_t type (%t) +// ptrdiff_t is normally defined in as long or long long type +// default: activated +#ifndef PRINTF_DISABLE_SUPPORT_PTRDIFF_T +#define PRINTF_SUPPORT_PTRDIFF_T +#endif + +/////////////////////////////////////////////////////////////////////////////// + +// internal flag definitions +#define FLAGS_ZEROPAD (1U << 0U) +#define FLAGS_LEFT (1U << 1U) +#define FLAGS_PLUS (1U << 2U) +#define FLAGS_SPACE (1U << 3U) +#define FLAGS_HASH (1U << 4U) +#define FLAGS_UPPERCASE (1U << 5U) +#define FLAGS_CHAR (1U << 6U) +#define FLAGS_SHORT (1U << 7U) +#define FLAGS_LONG (1U << 8U) +#define FLAGS_LONG_LONG (1U << 9U) +#define FLAGS_PRECISION (1U << 10U) +#define FLAGS_ADAPT_EXP (1U << 11U) + + +// import float.h for DBL_MAX +#if defined(PRINTF_SUPPORT_FLOAT) +#include +#endif + + +// output function type +typedef void (*out_fct_type)(char character, void* buffer, size_t idx, size_t maxlen); + + +// wrapper (used as buffer) for output function type +typedef struct { + void (*fct)(char character, void* arg); + void* arg; +} out_fct_wrap_type; + + +// internal buffer output +static inline void _out_buffer(char character, void* buffer, size_t idx, size_t maxlen) +{ + if (idx < maxlen) { + ((char*)buffer)[idx] = character; + } +} + + +// internal null output +static inline void _out_null(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)character; (void)buffer; (void)idx; (void)maxlen; +} + + +// internal _putchar wrapper +static inline void _out_char(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)buffer; (void)idx; (void)maxlen; + if (character) { +// #ifdef C_SECURE_CODE +// volatile uint32_t* mytest = 0x50080000 + 0x84; +// *mytest &= ~(1 << 5); +// __putchar(character); +// #else + _putchar(character); +// #endif +// #ifdef C_SECURE_CODE +// *mytest |= (1 << 5); +// #endif + } +} + + +// internal output function wrapper +static inline void _out_fct(char character, void* buffer, size_t idx, size_t maxlen) +{ + (void)idx; (void)maxlen; + if (character) { + // buffer is the output fct pointer + ((out_fct_wrap_type*)buffer)->fct(character, ((out_fct_wrap_type*)buffer)->arg); + } +} + + +// internal secure strlen +// \return The length of the string (excluding the terminating 0) limited by 'maxsize' +static inline unsigned int _strnlen_s(const char* str, size_t maxsize) +{ + const char* s; + for (s = str; *s && maxsize--; ++s); + return (unsigned int)(s - str); +} + + +// internal test if char is a digit (0-9) +// \return true if char is a digit +static inline bool _is_digit(char ch) +{ + return (ch >= '0') && (ch <= '9'); +} + + +// internal ASCII string to unsigned int conversion +static unsigned int _atoi(const char** str) +{ + unsigned int i = 0U; + while (_is_digit(**str)) { + i = i * 10U + (unsigned int)(*((*str)++) - '0'); + } + return i; +} + + +// output the specified string in reverse, taking care of any zero-padding +static size_t _out_rev(out_fct_type out, char* buffer, size_t idx, size_t maxlen, const char* buf, size_t len, unsigned int width, unsigned int flags) +{ + const size_t start_idx = idx; + + // pad spaces up to given width + if (!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) { + for (size_t i = len; i < width; i++) { + out(' ', buffer, idx++, maxlen); + } + } + + // reverse string + while (len) { + out(buf[--len], buffer, idx++, maxlen); + } + + // append pad spaces up to given width + if (flags & FLAGS_LEFT) { + while (idx - start_idx < width) { + out(' ', buffer, idx++, maxlen); + } + } + + return idx; +} + + +// internal itoa format +static size_t _ntoa_format(out_fct_type out, char* buffer, size_t idx, size_t maxlen, char* buf, size_t len, bool negative, unsigned int base, unsigned int prec, unsigned int width, unsigned int flags) +{ + // pad leading zeros + if (!(flags & FLAGS_LEFT)) { + if (width && (flags & FLAGS_ZEROPAD) && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { + width--; + } + while ((len < prec) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + while ((flags & FLAGS_ZEROPAD) && (len < width) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + } + + // handle hash + if (flags & FLAGS_HASH) { + if (!(flags & FLAGS_PRECISION) && len && ((len == prec) || (len == width))) { + len--; + if (len && (base == 16U)) { + len--; + } + } + if ((base == 16U) && !(flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'x'; + } + else if ((base == 16U) && (flags & FLAGS_UPPERCASE) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'X'; + } + else if ((base == 2U) && (len < PRINTF_NTOA_BUFFER_SIZE)) { + buf[len++] = 'b'; + } + if (len < PRINTF_NTOA_BUFFER_SIZE) { + buf[len++] = '0'; + } + } + + if (len < PRINTF_NTOA_BUFFER_SIZE) { + if (negative) { + buf[len++] = '-'; + } + else if (flags & FLAGS_PLUS) { + buf[len++] = '+'; // ignore the space if the '+' exists + } + else if (flags & FLAGS_SPACE) { + buf[len++] = ' '; + } + } + + return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); +} + + +// internal itoa for 'long' type +static size_t _ntoa_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long value, bool negative, unsigned long base, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_NTOA_BUFFER_SIZE]; + size_t len = 0U; + + // no hash for 0 values + if (!value) { + flags &= ~FLAGS_HASH; + } + + // write if precision != 0 and value is != 0 + if (!(flags & FLAGS_PRECISION) || value) { + do { + const char digit = (char)(value % base); + buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; + value /= base; + } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); + } + + return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); +} + + +// internal itoa for 'long long' type +#if defined(PRINTF_SUPPORT_LONG_LONG) +static size_t _ntoa_long_long(out_fct_type out, char* buffer, size_t idx, size_t maxlen, unsigned long long value, bool negative, unsigned long long base, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_NTOA_BUFFER_SIZE]; + size_t len = 0U; + + // no hash for 0 values + if (!value) { + flags &= ~FLAGS_HASH; + } + + // write if precision != 0 and value is != 0 + if (!(flags & FLAGS_PRECISION) || value) { + do { + const char digit = (char)(value % base); + buf[len++] = digit < 10 ? '0' + digit : (flags & FLAGS_UPPERCASE ? 'A' : 'a') + digit - 10; + value /= base; + } while (value && (len < PRINTF_NTOA_BUFFER_SIZE)); + } + + return _ntoa_format(out, buffer, idx, maxlen, buf, len, negative, (unsigned int)base, prec, width, flags); +} +#endif // PRINTF_SUPPORT_LONG_LONG + + +#if defined(PRINTF_SUPPORT_FLOAT) + +#if defined(PRINTF_SUPPORT_EXPONENTIAL) +// forward declaration so that _ftoa can switch to exp notation for values > PRINTF_MAX_FLOAT +static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags); +#endif + + +// internal ftoa for fixed decimal floating point +static size_t _ftoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) +{ + char buf[PRINTF_FTOA_BUFFER_SIZE]; + size_t len = 0U; + double diff = 0.0; + + // powers of 10 + static const double pow10[] = { 1, 10, 100, 1000, 10000, 100000, 1000000, 10000000, 100000000, 1000000000 }; + + // test for special values + if (value != value) + return _out_rev(out, buffer, idx, maxlen, "nan", 3, width, flags); + if (value < -DBL_MAX) + return _out_rev(out, buffer, idx, maxlen, "fni-", 4, width, flags); + if (value > DBL_MAX) + return _out_rev(out, buffer, idx, maxlen, (flags & FLAGS_PLUS) ? "fni+" : "fni", (flags & FLAGS_PLUS) ? 4U : 3U, width, flags); + + // test for very large values + // standard printf behavior is to print EVERY whole number digit -- which could be 100s of characters overflowing your buffers == bad + if ((value > PRINTF_MAX_FLOAT) || (value < -PRINTF_MAX_FLOAT)) { +#if defined(PRINTF_SUPPORT_EXPONENTIAL) + return _etoa(out, buffer, idx, maxlen, value, prec, width, flags); +#else + return 0U; +#endif + } + + // test for negative + bool negative = false; + if (value < 0) { + negative = true; + value = 0 - value; + } + + // set default precision, if not set explicitly + if (!(flags & FLAGS_PRECISION)) { + prec = PRINTF_DEFAULT_FLOAT_PRECISION; + } + // limit precision to 9, cause a prec >= 10 can lead to overflow errors + while ((len < PRINTF_FTOA_BUFFER_SIZE) && (prec > 9U)) { + buf[len++] = '0'; + prec--; + } + + int whole = (int)value; + double tmp = (value - whole) * pow10[prec]; + unsigned long frac = (unsigned long)tmp; + diff = tmp - frac; + + if (diff > 0.5) { + ++frac; + // handle rollover, e.g. case 0.99 with prec 1 is 1.0 + if (frac >= pow10[prec]) { + frac = 0; + ++whole; + } + } + else if (diff < 0.5) { + } + else if ((frac == 0U) || (frac & 1U)) { + // if halfway, round up if odd OR if last digit is 0 + ++frac; + } + + if (prec == 0U) { + diff = value - (double)whole; + if ((!(diff < 0.5) || (diff > 0.5)) && (whole & 1)) { + // exactly 0.5 and ODD, then round up + // 1.5 -> 2, but 2.5 -> 2 + ++whole; + } + } + else { + unsigned int count = prec; + // now do fractional part, as an unsigned number + while (len < PRINTF_FTOA_BUFFER_SIZE) { + --count; + buf[len++] = (char)(48U + (frac % 10U)); + if (!(frac /= 10U)) { + break; + } + } + // add extra 0s + while ((len < PRINTF_FTOA_BUFFER_SIZE) && (count-- > 0U)) { + buf[len++] = '0'; + } + if (len < PRINTF_FTOA_BUFFER_SIZE) { + // add decimal + buf[len++] = '.'; + } + } + + // do whole part, number is reversed + while (len < PRINTF_FTOA_BUFFER_SIZE) { + buf[len++] = (char)(48 + (whole % 10)); + if (!(whole /= 10)) { + break; + } + } + + // pad leading zeros + if (!(flags & FLAGS_LEFT) && (flags & FLAGS_ZEROPAD)) { + if (width && (negative || (flags & (FLAGS_PLUS | FLAGS_SPACE)))) { + width--; + } + while ((len < width) && (len < PRINTF_FTOA_BUFFER_SIZE)) { + buf[len++] = '0'; + } + } + + if (len < PRINTF_FTOA_BUFFER_SIZE) { + if (negative) { + buf[len++] = '-'; + } + else if (flags & FLAGS_PLUS) { + buf[len++] = '+'; // ignore the space if the '+' exists + } + else if (flags & FLAGS_SPACE) { + buf[len++] = ' '; + } + } + + return _out_rev(out, buffer, idx, maxlen, buf, len, width, flags); +} + + +#if defined(PRINTF_SUPPORT_EXPONENTIAL) +// internal ftoa variant for exponential floating-point type, contributed by Martijn Jasperse +static size_t _etoa(out_fct_type out, char* buffer, size_t idx, size_t maxlen, double value, unsigned int prec, unsigned int width, unsigned int flags) +{ + // check for NaN and special values + if ((value != value) || (value > DBL_MAX) || (value < -DBL_MAX)) { + return _ftoa(out, buffer, idx, maxlen, value, prec, width, flags); + } + + // determine the sign + const bool negative = value < 0; + if (negative) { + value = -value; + } + + // default precision + if (!(flags & FLAGS_PRECISION)) { + prec = PRINTF_DEFAULT_FLOAT_PRECISION; + } + + // determine the decimal exponent + // based on the algorithm by David Gay (https://www.ampl.com/netlib/fp/dtoa.c) + union { + uint64_t U; + double F; + } conv; + + conv.F = value; + int exp2 = (int)((conv.U >> 52U) & 0x07FFU) - 1023; // effectively log2 + conv.U = (conv.U & ((1ULL << 52U) - 1U)) | (1023ULL << 52U); // drop the exponent so conv.F is now in [1,2) + // now approximate log10 from the log2 integer part and an expansion of ln around 1.5 + int expval = (int)(0.1760912590558 + exp2 * 0.301029995663981 + (conv.F - 1.5) * 0.289529654602168); + // now we want to compute 10^expval but we want to be sure it won't overflow + exp2 = (int)(expval * 3.321928094887362 + 0.5); + const double z = expval * 2.302585092994046 - exp2 * 0.6931471805599453; + const double z2 = z * z; + conv.U = (uint64_t)(exp2 + 1023) << 52U; + // compute exp(z) using continued fractions, see https://en.wikipedia.org/wiki/Exponential_function#Continued_fractions_for_ex + conv.F *= 1 + 2 * z / (2 - z + (z2 / (6 + (z2 / (10 + z2 / 14))))); + // correct for rounding errors + if (value < conv.F) { + expval--; + conv.F /= 10; + } + + // the exponent format is "%+03d" and largest value is "307", so set aside 4-5 characters + unsigned int minwidth = ((expval < 100) && (expval > -100)) ? 4U : 5U; + + // in "%g" mode, "prec" is the number of *significant figures* not decimals + if (flags & FLAGS_ADAPT_EXP) { + // do we want to fall-back to "%f" mode? + if ((value >= 1e-4) && (value < 1e6)) { + if ((int)prec > expval) { + prec = (unsigned)((int)prec - expval - 1); + } + else { + prec = 0; + } + flags |= FLAGS_PRECISION; // make sure _ftoa respects precision + // no characters in exponent + minwidth = 0U; + expval = 0; + } + else { + // we use one sigfig for the whole part + if ((prec > 0) && (flags & FLAGS_PRECISION)) { + --prec; + } + } + } + + // will everything fit? + unsigned int fwidth = width; + if (width > minwidth) { + // we didn't fall-back so subtract the characters required for the exponent + fwidth -= minwidth; + } else { + // not enough characters, so go back to default sizing + fwidth = 0U; + } + if ((flags & FLAGS_LEFT) && minwidth) { + // if we're padding on the right, DON'T pad the floating part + fwidth = 0U; + } + + // rescale the float value + if (expval) { + value /= conv.F; + } + + // output the floating part + const size_t start_idx = idx; + idx = _ftoa(out, buffer, idx, maxlen, negative ? -value : value, prec, fwidth, flags & ~FLAGS_ADAPT_EXP); + + // output the exponent part + if (minwidth) { + // output the exponential symbol + out((flags & FLAGS_UPPERCASE) ? 'E' : 'e', buffer, idx++, maxlen); + // output the exponent value + idx = _ntoa_long(out, buffer, idx, maxlen, (expval < 0) ? -expval : expval, expval < 0, 10, 0, minwidth-1, FLAGS_ZEROPAD | FLAGS_PLUS); + // might need to right-pad spaces + if (flags & FLAGS_LEFT) { + while (idx - start_idx < width) out(' ', buffer, idx++, maxlen); + } + } + return idx; +} +#endif // PRINTF_SUPPORT_EXPONENTIAL +#endif // PRINTF_SUPPORT_FLOAT + + +// internal vsnprintf +static int _vsnprintf(out_fct_type out, char* buffer, const size_t maxlen, const char* format, va_list va) +{ + unsigned int flags, width, precision, n; + size_t idx = 0U; + + if (!buffer) { + // use null output function + out = _out_null; + } + + while (*format) + { + // format specifier? %[flags][width][.precision][length] + if (*format != '%') { + // no + out(*format, buffer, idx++, maxlen); + format++; + continue; + } + else { + // yes, evaluate it + format++; + } + + // evaluate flags + flags = 0U; + do { + switch (*format) { + case '0': flags |= FLAGS_ZEROPAD; format++; n = 1U; break; + case '-': flags |= FLAGS_LEFT; format++; n = 1U; break; + case '+': flags |= FLAGS_PLUS; format++; n = 1U; break; + case ' ': flags |= FLAGS_SPACE; format++; n = 1U; break; + case '#': flags |= FLAGS_HASH; format++; n = 1U; break; + default : n = 0U; break; + } + } while (n); + + // evaluate width field + width = 0U; + if (_is_digit(*format)) { + width = _atoi(&format); + } + else if (*format == '*') { + const int w = va_arg(va, int); + if (w < 0) { + flags |= FLAGS_LEFT; // reverse padding + width = (unsigned int)-w; + } + else { + width = (unsigned int)w; + } + format++; + } + + // evaluate precision field + precision = 0U; + if (*format == '.') { + flags |= FLAGS_PRECISION; + format++; + if (_is_digit(*format)) { + precision = _atoi(&format); + } + else if (*format == '*') { + const int prec = (int)va_arg(va, int); + precision = prec > 0 ? (unsigned int)prec : 0U; + format++; + } + } + + // evaluate length field + switch (*format) { + case 'l' : + flags |= FLAGS_LONG; + format++; + if (*format == 'l') { + flags |= FLAGS_LONG_LONG; + format++; + } + break; + case 'h' : + flags |= FLAGS_SHORT; + format++; + if (*format == 'h') { + flags |= FLAGS_CHAR; + format++; + } + break; +#if defined(PRINTF_SUPPORT_PTRDIFF_T) + case 't' : + flags |= (sizeof(ptrdiff_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; +#endif + case 'j' : + flags |= (sizeof(intmax_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; + case 'z' : + flags |= (sizeof(size_t) == sizeof(long) ? FLAGS_LONG : FLAGS_LONG_LONG); + format++; + break; + default : + break; + } + + // evaluate specifier + switch (*format) { + case 'd' : + case 'i' : + case 'u' : + case 'x' : + case 'X' : + case 'o' : + case 'b' : { + // set the base + unsigned int base; + if (*format == 'x' || *format == 'X') { + base = 16U; + } + else if (*format == 'o') { + base = 8U; + } + else if (*format == 'b') { + base = 2U; + } + else { + base = 10U; + flags &= ~FLAGS_HASH; // no hash for dec format + } + // uppercase + if (*format == 'X') { + flags |= FLAGS_UPPERCASE; + } + + // no plus or space flag for u, x, X, o, b + if ((*format != 'i') && (*format != 'd')) { + flags &= ~(FLAGS_PLUS | FLAGS_SPACE); + } + + // ignore '0' flag when precision is given + if (flags & FLAGS_PRECISION) { + flags &= ~FLAGS_ZEROPAD; + } + + // convert the integer + if ((*format == 'i') || (*format == 'd')) { + // signed + if (flags & FLAGS_LONG_LONG) { +#if defined(PRINTF_SUPPORT_LONG_LONG) + const long long value = va_arg(va, long long); + idx = _ntoa_long_long(out, buffer, idx, maxlen, (unsigned long long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); +#endif + } + else if (flags & FLAGS_LONG) { + const long value = va_arg(va, long); + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); + } + else { + const int value = (flags & FLAGS_CHAR) ? (char)va_arg(va, int) : (flags & FLAGS_SHORT) ? (short int)va_arg(va, int) : va_arg(va, int); + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned int)(value > 0 ? value : 0 - value), value < 0, base, precision, width, flags); + } + } + else { + // unsigned + if (flags & FLAGS_LONG_LONG) { +#if defined(PRINTF_SUPPORT_LONG_LONG) + idx = _ntoa_long_long(out, buffer, idx, maxlen, va_arg(va, unsigned long long), false, base, precision, width, flags); +#endif + } + else if (flags & FLAGS_LONG) { + idx = _ntoa_long(out, buffer, idx, maxlen, va_arg(va, unsigned long), false, base, precision, width, flags); + } + else { + const unsigned int value = (flags & FLAGS_CHAR) ? (unsigned char)va_arg(va, unsigned int) : (flags & FLAGS_SHORT) ? (unsigned short int)va_arg(va, unsigned int) : va_arg(va, unsigned int); + idx = _ntoa_long(out, buffer, idx, maxlen, value, false, base, precision, width, flags); + } + } + format++; + break; + } +#if defined(PRINTF_SUPPORT_FLOAT) + case 'f' : + case 'F' : + if (*format == 'F') flags |= FLAGS_UPPERCASE; + idx = _ftoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); + format++; + break; +#if defined(PRINTF_SUPPORT_EXPONENTIAL) + case 'e': + case 'E': + case 'g': + case 'G': + if ((*format == 'g')||(*format == 'G')) flags |= FLAGS_ADAPT_EXP; + if ((*format == 'E')||(*format == 'G')) flags |= FLAGS_UPPERCASE; + idx = _etoa(out, buffer, idx, maxlen, va_arg(va, double), precision, width, flags); + format++; + break; +#endif // PRINTF_SUPPORT_EXPONENTIAL +#endif // PRINTF_SUPPORT_FLOAT + case 'c' : { + unsigned int l = 1U; + // pre padding + if (!(flags & FLAGS_LEFT)) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + // char output + out((char)va_arg(va, int), buffer, idx++, maxlen); + // post padding + if (flags & FLAGS_LEFT) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + format++; + break; + } + + case 's' : { + const char* p = va_arg(va, char*); + unsigned int l = _strnlen_s(p, precision ? precision : (size_t)-1); + // pre padding + if (flags & FLAGS_PRECISION) { + l = (l < precision ? l : precision); + } + if (!(flags & FLAGS_LEFT)) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + // string output + while ((*p != 0) && (!(flags & FLAGS_PRECISION) || precision--)) { + out(*(p++), buffer, idx++, maxlen); + } + // post padding + if (flags & FLAGS_LEFT) { + while (l++ < width) { + out(' ', buffer, idx++, maxlen); + } + } + format++; + break; + } + + case 'p' : { + width = sizeof(void*) * 2U; + flags |= FLAGS_ZEROPAD | FLAGS_UPPERCASE; +#if defined(PRINTF_SUPPORT_LONG_LONG) + const bool is_ll = sizeof(uintptr_t) == sizeof(long long); + if (is_ll) { + idx = _ntoa_long_long(out, buffer, idx, maxlen, (uintptr_t)va_arg(va, void*), false, 16U, precision, width, flags); + } + else { +#endif + idx = _ntoa_long(out, buffer, idx, maxlen, (unsigned long)((uintptr_t)va_arg(va, void*)), false, 16U, precision, width, flags); +#if defined(PRINTF_SUPPORT_LONG_LONG) + } +#endif + format++; + break; + } + + case '%' : + out('%', buffer, idx++, maxlen); + format++; + break; + + default : + out(*format, buffer, idx++, maxlen); + format++; + break; + } + } + + // termination + out((char)0, buffer, idx < maxlen ? idx : maxlen - 1U, maxlen); + + // return written chars without terminating \0 + return (int)idx; +} + + +/////////////////////////////////////////////////////////////////////////////// + +int printf_(const char* format, ...) +{ + #ifdef DEBUG_OUT_PREFIX + char fnt_clr[] = {'\e','[','3','1','m'}; + char *ptr1 = fnt_clr; + int cnt = 5; + fnt_clr[3] = '0' + DEBUG_OUT_PREFIX; + while(cnt--) { + // while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); + // DEBUG_PORT->DAT = *ptr1++; + _putchar(*ptr1++); + } + #endif + + va_list va; + va_start(va, format); + char buffer[1]; + const int ret = _vsnprintf(_out_char, buffer, (size_t)-1, format, va); + va_end(va); + return ret; +} + + +int sprintf_(char* buffer, const char* format, ...) +{ + va_list va; + va_start(va, format); + const int ret = _vsnprintf(_out_buffer, buffer, (size_t)-1, format, va); + va_end(va); + return ret; +} + + +int snprintf_(char* buffer, size_t count, const char* format, ...) +{ + va_list va; + va_start(va, format); + const int ret = _vsnprintf(_out_buffer, buffer, count, format, va); + va_end(va); + return ret; +} + + +int vprintf_(const char* format, va_list va) +{ + char buffer[1]; + return _vsnprintf(_out_char, buffer, (size_t)-1, format, va); +} + + +int vsnprintf_(char* buffer, size_t count, const char* format, va_list va) +{ + return _vsnprintf(_out_buffer, buffer, count, format, va); +} + + +int fctprintf(void (*out)(char character, void* arg), void* arg, const char* format, ...) +{ + va_list va; + va_start(va, format); + const out_fct_wrap_type out_fct_wrap = { out, arg }; + const int ret = _vsnprintf(_out_fct, (char*)(uintptr_t)&out_fct_wrap, (size_t)-1, format, va); + va_end(va); + return ret; +} diff --git a/arch/cortex-m23/m2351/src/StdDriver/src/retarget.c b/arch/cortex-m23/m2351/src/StdDriver/src/retarget.c index d4bb9921..7a8fcbfd 100644 --- a/arch/cortex-m23/m2351/src/StdDriver/src/retarget.c +++ b/arch/cortex-m23/m2351/src/StdDriver/src/retarget.c @@ -13,6 +13,8 @@ #include #include "NuMicro.h" +#include "printf.h" + #if defined (__ICCARM__) # pragma diag_suppress=Pm150 #endif @@ -511,7 +513,10 @@ int32_t SH_Return(int32_t n32In_R0, int32_t n32In_R1, int32_t *pn32Out_R0) #endif /* defined(DEBUG_ENABLE_SEMIHOST) */ - +void _putchar(char character) +{ + SendChar_ToUART(character); +} /** * @brief Routine to send a char * @@ -769,42 +774,42 @@ int fputc(int ch, FILE *stream) #if (defined(__GNUC__) && !defined(__ARMCC_VERSION)) #if !defined(OS_USE_SEMIHOSTING) -int _write (int fd, char *ptr, int len) -{ - int i = len; -#ifdef DEBUG_OUT_PREFIX - char fnt_clr[] = {'\e','[','3','1','m'}; - char *ptr1 = fnt_clr; - int cnt = 5; - fnt_clr[3] = '0' + DEBUG_OUT_PREFIX; - while(cnt--) { - while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); - DEBUG_PORT->DAT = *ptr1++; - } -#endif - - while(i--) { - while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); - - if(*ptr == '\n') { - DEBUG_PORT->DAT = '\r'; - while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); - } - - DEBUG_PORT->DAT = *ptr++; - } - return len; -} - -int _read (int fd, char *ptr, int len) -{ - - while((DEBUG_PORT->FIFOSTS & UART_FIFOSTS_RXEMPTY_Msk) != 0); - *ptr = DEBUG_PORT->DAT; - return 1; - - -} +// int _write (int fd, char *ptr, int len) +// { +// int i = len; +// #ifdef DEBUG_OUT_PREFIX +// char fnt_clr[] = {'\e','[','3','1','m'}; +// char *ptr1 = fnt_clr; +// int cnt = 5; +// fnt_clr[3] = '0' + DEBUG_OUT_PREFIX; +// while(cnt--) { +// while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); +// DEBUG_PORT->DAT = *ptr1++; +// } +// #endif + +// while(i--) { +// while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); + +// if(*ptr == '\n') { +// DEBUG_PORT->DAT = '\r'; +// while(DEBUG_PORT->FIFOSTS & UART_FIFOSTS_TXFULL_Msk); +// } + +// DEBUG_PORT->DAT = *ptr++; +// } +// return len; +// } + +// int _read (int fd, char *ptr, int len) +// { + +// while((DEBUG_PORT->FIFOSTS & UART_FIFOSTS_RXEMPTY_Msk) != 0); +// *ptr = DEBUG_PORT->DAT; +// return 1; + + +// } #endif #else diff --git a/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/Make.defs b/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/Make.defs index 2cdab6cc..df774c02 100644 --- a/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/Make.defs +++ b/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/Make.defs @@ -31,7 +31,6 @@ CMN_CSRCS = CHIP_ASRCS_NS = ../../Device/Nuvoton/M2351/Source/GCC/startup_M2351.S CHIP_CSRCS_NS = ../../Device/Nuvoton/M2351/Source/system_M2351.c \ - ../../Device/Nuvoton/M2351/Source/GCC/_syscalls.c \ main_ns.c \ ../../../../../../tee_client/libteec/src/tee_client_api.c diff --git a/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/main_ns.c b/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/main_ns.c index 1b0e56ac..3230a046 100644 --- a/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/main_ns.c +++ b/arch/cortex-m23/m2351/src/m2351_badge/nonsecure/main_ns.c @@ -26,6 +26,7 @@ #include "M2351.h" #include "version.h" #include "config.h" +#include "printf.h" /* FreeRTOS includes. */ #include "FreeRTOS.h" @@ -215,7 +216,7 @@ static void menuTask(void *pvParameters) #endif printf("+-----------------------------------------------------------+\n"); - printf("\n[%c]\n", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { #ifdef CONFIG_APPS_HELLO_WORLD @@ -660,7 +661,7 @@ void menu_security_exception_example_ns(void) printf("| [a] | Read 0x30018000 address (nonexistent) | Hard fault |\n"); printf("+----------------------------------------------------------------------+\n"); - printf("\n[%c] ", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { case '1': @@ -728,7 +729,7 @@ int main( void ) /* Prepare the hardware to run this demo. */ prvSetupHardware(); - printf("\n\n\t-=mTower v" VERSION "=- " __DATE__ " " __TIME__"\n\n"); + printf("\n\n\t-= mTower v" VERSION " =- " __DATE__ " " __TIME__"\n\n"); printf("+---------------------------------------------+\n"); printf("| Nonsecure FreeRTOS (BL33) is running ... |\n"); diff --git a/arch/cortex-m23/m2351/src/m2351_badge/secure/Make.defs b/arch/cortex-m23/m2351/src/m2351_badge/secure/Make.defs index c7eaf64c..4bc3f78c 100644 --- a/arch/cortex-m23/m2351/src/m2351_badge/secure/Make.defs +++ b/arch/cortex-m23/m2351/src/m2351_badge/secure/Make.defs @@ -50,7 +50,6 @@ CMN_CSRCS = ../../../../../../tee/lib/libutee/tee_api_operations.c \ CHIP_ASRCS_S = ../../Device/Nuvoton/M2351/Source/GCC/startup_M2351.S CHIP_CSRCS_S = ../../Device/Nuvoton/M2351/Source/system_M2351.c \ - ../../Device/Nuvoton/M2351/Source/GCC/_syscalls.c \ main.c ifeq ($(CONFIG_APPS_HELLO_WORLD),y) diff --git a/arch/cortex-m23/m2351/src/m2351_badge/secure/main.c b/arch/cortex-m23/m2351/src/m2351_badge/secure/main.c index 92c5bbb3..d8978578 100644 --- a/arch/cortex-m23/m2351/src/m2351_badge/secure/main.c +++ b/arch/cortex-m23/m2351/src/m2351_badge/secure/main.c @@ -27,6 +27,7 @@ #include "config.h" #include "version.h" #include "tee_api_types.h" +#include "printf.h" /* Pre-processor Definitions. */ #define NORMAL "\e[0m" @@ -370,7 +371,7 @@ void menu_security_exception_example(void) printf("|[any]| Go non-secure code | Exec. non-sec code |\n"); printf("+---------------------------------------------------------------------+\n"); - printf("\n[%c] ", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { case '1': @@ -614,7 +615,7 @@ int main(void) /* UART is configured as debug port */ DEBUG_PORT_Init(); - printf(NORMAL "\n\n\t-=mTower v" VERSION "=- " __DATE__ " " __TIME__"\n\n"); + printf(NORMAL "\n\n\t-= mTower v" VERSION " =- " __DATE__ " " __TIME__"\n\n"); printf("+---------------------------------------------+\n"); printf("| Secure handler (BL32) is running ... |\n"); diff --git a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/Make.defs b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/Make.defs index dbe75251..0fed36d5 100644 --- a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/Make.defs +++ b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/Make.defs @@ -31,7 +31,6 @@ CMN_CSRCS = CHIP_ASRCS_NS = ../../Device/Nuvoton/M2351/Source/GCC/startup_M2351.S CHIP_CSRCS_NS = ../../Device/Nuvoton/M2351/Source/system_M2351.c \ - ../../Device/Nuvoton/M2351/Source/GCC/_syscalls.c \ main_ns.c \ ../../../../../../tee_client/libteec/src/tee_client_api.c diff --git a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/main_ns.c b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/main_ns.c index 7668729f..066b3cab 100644 --- a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/main_ns.c +++ b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/nonsecure/main_ns.c @@ -32,6 +32,8 @@ #include "task.h" #include "semphr.h" +#include "printf.h" + /* Demo application include. */ /* Pre-processor Definitions. */ @@ -215,7 +217,7 @@ static void menuTask(void *pvParameters) #endif printf("+-----------------------------------------------------------+\n"); - printf("\n[%c]\n", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { #ifdef CONFIG_APPS_HELLO_WORLD @@ -660,7 +662,7 @@ void menu_security_exception_example_ns(void) printf("| [a] | Read 0x30018000 address (nonexistent) | Hard fault |\n"); printf("+----------------------------------------------------------------------+\n"); - printf("\n[%c] ", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { case '1': @@ -728,7 +730,7 @@ int main( void ) /* Prepare the hardware to run this demo. */ prvSetupHardware(); - printf("\n\n\t-=mTower v" VERSION "=- " __DATE__ " " __TIME__"\n\n"); + printf("\n\n\t-= mTower v" VERSION " =- " __DATE__ " " __TIME__"\n\n"); printf("+---------------------------------------------+\n"); printf("| Nonsecure FreeRTOS (BL33) is running ... |\n"); diff --git a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/Make.defs b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/Make.defs index abc1cbb6..725f2b7e 100644 --- a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/Make.defs +++ b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/Make.defs @@ -50,7 +50,6 @@ CMN_CSRCS = ../../../../../../tee/lib/libutee/tee_api_operations.c \ CHIP_ASRCS_S = ../../Device/Nuvoton/M2351/Source/GCC/startup_M2351.S CHIP_CSRCS_S = ../../Device/Nuvoton/M2351/Source/system_M2351.c \ - ../../Device/Nuvoton/M2351/Source/GCC/_syscalls.c \ main.c ifeq ($(CONFIG_APPS_HELLO_WORLD),y) diff --git a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/main.c b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/main.c index 0ce46d86..8bd886d6 100644 --- a/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/main.c +++ b/arch/cortex-m23/m2351/src/numaker_pfm_m2351/secure/main.c @@ -27,6 +27,7 @@ #include "config.h" #include "version.h" #include "tee_api_types.h" +#include "printf.h" /* Pre-processor Definitions. */ #define NORMAL "\e[0m" @@ -363,7 +364,7 @@ void menu_security_exception_example(void) printf("|[any]| Go non-secure code | Exec. non-sec code |\n"); printf("+---------------------------------------------------------------------+\n"); - printf("\n[%c] ", ch = getchar()); + printf("\n[%c]\n", ch = GetChar()); switch (ch) { case '1': @@ -607,7 +608,7 @@ int main(void) /* UART is configured as debug port */ DEBUG_PORT_Init(); - printf(NORMAL "\n\n\t-=mTower v" VERSION "=- " __DATE__ " " __TIME__"\n\n"); + printf(NORMAL "\n\n\t-= mTower v" VERSION " =- " __DATE__ " " __TIME__"\n\n"); printf("+---------------------------------------------+\n"); printf("| Secure handler (BL32) is running ... |\n"); diff --git a/docs/build.md b/docs/build.md index c7b42888..242e80d1 100644 --- a/docs/build.md +++ b/docs/build.md @@ -114,12 +114,8 @@ cd mTower/ make PLATFORM=numaker_pfm_m2351 create_context ``` -To use BootLoader2 for M2351 Nuvoton chips, you need to download NuBL2 sources and -syscall file. This can be done by executing following shell commands: +To use BootLoader2 for M2351 Nuvoton chips, you need to download NuBL2 sources. This can be done by executing following shell commands: -```sh -wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/Library/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -O ./arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c -``` ```sh wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode/MKROM/SecureBootDemo/NuBL2/main.c -O ./arch/cortex-m23/m2351/src/NuBL2/main.c ``` @@ -136,10 +132,6 @@ wget -L https://raw.githubusercontent.com/OpenNuvoton/M2351BSP/master/SampleCode > Please note that files from these downloads contain the following copyright notice: `Copyright (C) 2017 Nuvoton Technology Corp. All rights reserved.` Licensing terms specified [here](https://github.com/OpenNuvoton/M2351BSP/blob/master/NUVOTON%20SOFTWARE%20LICENSE%20AGREEMENT.pdf). -`arch/cortex-m23/m2351/src/Device/Nuvoton/M2351/Source/GCC/_syscalls.c` under: -// This file is part of the uOS++ III distribution -// Parts of this file are from the newlib sources, issued under GPL. -// Copyright (c) 2014 Liviu Ionescu ### 2.4 Get the toolchains In mTower different toolchains are used for different targets (depends on diff --git a/freertos/tasks.c b/freertos/tasks.c index c3db5909..64c89f0a 100644 --- a/freertos/tasks.c +++ b/freertos/tasks.c @@ -53,7 +53,8 @@ functions but without including stdio.h here. */ to generate human readable text from the raw data generated by the uxTaskGetSystemState() function. Note the formatting functions are provided for convenience only, and are NOT considered part of the kernel. */ - #include + //#include + #include "printf.h" #endif /* configUSE_STATS_FORMATTING_FUNCTIONS == 1 ) */ #if( configUSE_PREEMPTION == 0 ) diff --git a/include/mtower/err.h b/include/mtower/err.h index 53afb762..82224053 100644 --- a/include/mtower/err.h +++ b/include/mtower/err.h @@ -22,7 +22,7 @@ #define __INCLUDE_MTOWER_ERR_H_ /* Included Files */ - +#include "printf.h" /* Pre-processor Definitions */ /* All C pre-processor macros are defined here. */ diff --git a/include/mtower/version.h b/include/mtower/version.h index 23e4a80a..ef30fd6f 100644 --- a/include/mtower/version.h +++ b/include/mtower/version.h @@ -28,7 +28,7 @@ /* All C pre-processor macros are defined here. */ /** mTower version */ -#define VERSION "0.3" +#define VERSION "0.4.1" /* Public Types */ diff --git a/tee/kernel/entry_std.c b/tee/kernel/entry_std.c index 260d9a91..88b462b1 100644 --- a/tee/kernel/entry_std.c +++ b/tee/kernel/entry_std.c @@ -32,6 +32,9 @@ #include #include #include + +#include "printf.h" + // #include "M2351.h" // #include "partition_M2351.h" diff --git a/tee/kernel/pseudo_ta.c b/tee/kernel/pseudo_ta.c index 0f638723..cdb2f236 100644 --- a/tee/kernel/pseudo_ta.c +++ b/tee/kernel/pseudo_ta.c @@ -45,6 +45,8 @@ #include "tee.h" #include "tee_api_defines.h" +#include "printf.h" + extern const struct pseudo_ta_head __start_ta_head_section; extern const struct pseudo_ta_head __stop_ta_head_section; diff --git a/tee/kernel/tee_ta_manager.c b/tee/kernel/tee_ta_manager.c index 438bbe75..051566e8 100644 --- a/tee/kernel/tee_ta_manager.c +++ b/tee/kernel/tee_ta_manager.c @@ -58,6 +58,8 @@ //#include "tee_client_api.h" //#include "tee.h" +#include "printf.h" + struct tee_ta_session *current_session; /* This mutex protects the critical section in tee_ta_init_session */ //struct mutex tee_ta_mutex = MUTEX_INITIALIZER; diff --git a/tee/lib/libutee/include/tee_internal_api_extensions.h b/tee/lib/libutee/include/tee_internal_api_extensions.h index a140c04d..ea3b9d8f 100644 --- a/tee/lib/libutee/include/tee_internal_api_extensions.h +++ b/tee/lib/libutee/include/tee_internal_api_extensions.h @@ -35,6 +35,8 @@ #include #include +#include "printf.h" + void tee_user_mem_mark_heap(void); size_t tee_user_mem_check_heap(void); /* Hint implementation defines */ diff --git a/tee/lib/libutee/tee_api_arith.c b/tee/lib/libutee/tee_api_arith.c index f1b600e1..76d23757 100644 --- a/tee/lib/libutee/tee_api_arith.c +++ b/tee/lib/libutee/tee_api_arith.c @@ -30,6 +30,8 @@ #include #include +#include "printf.h" + /* * The mem pool. * We have a pool of scratch memory for internal usage. diff --git a/tee/lib/libutee/tee_api_panic.c b/tee/lib/libutee/tee_api_panic.c index 7ed701aa..ef1628ba 100644 --- a/tee/lib/libutee/tee_api_panic.c +++ b/tee/lib/libutee/tee_api_panic.c @@ -7,6 +7,8 @@ #include #include +#include "printf.h" + #define ACCESS_RW (TEE_MEMORY_ACCESS_READ | TEE_MEMORY_ACCESS_WRITE) #define ACCESS_W_ANY (TEE_MEMORY_ACCESS_WRITE | TEE_MEMORY_ACCESS_ANY_OWNER) #define ACCESS_R TEE_MEMORY_ACCESS_READ diff --git a/tee/lib/libutils/ext/trace.c b/tee/lib/libutils/ext/trace.c index 5f3cb6d8..bb1e7e4b 100644 --- a/tee/lib/libutils/ext/trace.c +++ b/tee/lib/libutils/ext/trace.c @@ -34,6 +34,8 @@ //#include //#include +#include "printf.h" + #if (TRACE_LEVEL > 0) int trace_level = TRACE_MAX; diff --git a/tee/tee/uuid.c b/tee/tee/uuid.c index f706ce85..c43607ce 100644 --- a/tee/tee/uuid.c +++ b/tee/tee/uuid.c @@ -8,6 +8,8 @@ #include #include +#include "printf.h" + void tee_uuid_to_octets(uint8_t *d, const TEE_UUID *s) { d[0] = s->timeLow >> 24; diff --git a/tee_client/libteec/src/tee_client_api.c b/tee_client/libteec/src/tee_client_api.c index dd1fd743..a485e16f 100644 --- a/tee_client/libteec/src/tee_client_api.c +++ b/tee_client/libteec/src/tee_client_api.c @@ -42,6 +42,8 @@ //#include //#include +#include "printf.h" + #ifndef __aligned #define __aligned(x) __attribute__((__aligned__(x))) #endif diff --git a/tee_client/public/teec_trace.h b/tee_client/public/teec_trace.h index 7afef605..64b5f17c 100644 --- a/tee_client/public/teec_trace.h +++ b/tee_client/public/teec_trace.h @@ -36,6 +36,8 @@ extern "C" { #include #include +#include "printf.h" + #ifndef BINARY_PREFIX #error "BINARY_PREFIX not defined" #endif