[components][libc][compilers][common]拆分armcc和iar的time相关函数到common目录,同时修复原来在使用LIBC时time相关函数的BUG(armcc下使用gmtime、localtime、mktime会导致崩溃)
This commit is contained in:
zhangjun
parent
3383f37f79
commit
3ede7630c0
|
|
@ -39,4 +39,10 @@ if RT_USING_LIBC && RT_USING_DFS
|
|||
default n
|
||||
endif
|
||||
|
||||
if RT_USING_LIBC != y
|
||||
config RT_USING_MINI_TIME
|
||||
bool "Enable MINI TIME FUNCTIONS WITHOUT COMPILER'S LIBC"
|
||||
default y
|
||||
endif
|
||||
|
||||
endmenu
|
||||
|
|
|
|||
|
|
@ -1,82 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2006-2018, RT-Thread Development Team
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
*/
|
||||
#include <sys/time.h>
|
||||
#include <rtthread.h>
|
||||
|
||||
#ifdef RT_USING_DEVICE
|
||||
int gettimeofday(struct timeval *tp, void *ignore)
|
||||
{
|
||||
time_t time;
|
||||
rt_device_t device;
|
||||
|
||||
device = rt_device_find("rtc");
|
||||
RT_ASSERT(device != RT_NULL);
|
||||
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
|
||||
if (tp != RT_NULL)
|
||||
{
|
||||
tp->tv_sec = time;
|
||||
tp->tv_usec = 0;
|
||||
}
|
||||
|
||||
return time;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Returns the current time.
|
||||
*
|
||||
* @param time_t * t the timestamp pointer, if not used, keep NULL.
|
||||
*
|
||||
* @return time_t return timestamp current.
|
||||
*
|
||||
*/
|
||||
/* for IAR 6.2 later Compiler */
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#pragma module_name = "?time"
|
||||
time_t (__time32)(time_t *t) /* Only supports 32-bit timestamp */
|
||||
#else
|
||||
time_t time(time_t *t)
|
||||
#endif
|
||||
{
|
||||
time_t time_now = 0;
|
||||
|
||||
#ifdef RT_USING_RTC
|
||||
static rt_device_t device = RT_NULL;
|
||||
|
||||
/* optimization: find rtc device only first. */
|
||||
if (device == RT_NULL)
|
||||
{
|
||||
device = rt_device_find("rtc");
|
||||
}
|
||||
|
||||
/* read timestamp from RTC device. */
|
||||
if (device != RT_NULL)
|
||||
{
|
||||
if (rt_device_open(device, 0) == RT_EOK)
|
||||
{
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
|
||||
rt_device_close(device);
|
||||
}
|
||||
}
|
||||
#endif /* RT_USING_RTC */
|
||||
|
||||
/* if t is not NULL, write timestamp to *t */
|
||||
if (t != RT_NULL)
|
||||
{
|
||||
*t = time_now;
|
||||
}
|
||||
|
||||
return time_now;
|
||||
}
|
||||
|
||||
RT_WEAK clock_t clock(void)
|
||||
{
|
||||
return rt_tick_get();
|
||||
}
|
||||
|
|
@ -2,11 +2,18 @@ from building import *
|
|||
|
||||
Import('rtconfig')
|
||||
|
||||
src = Glob('*.c')
|
||||
src = []
|
||||
cwd = GetCurrentDir()
|
||||
group = []
|
||||
CPPPATH = [cwd]
|
||||
|
||||
group = DefineGroup('libc', src, depend = ['RT_USING_LIBC'], CPPPATH = CPPPATH)
|
||||
if GetDepend('RT_USING_LIBC'):
|
||||
src += Glob('*.c')
|
||||
else:
|
||||
if GetDepend('RT_USING_MINI_TIME'):
|
||||
src += ['time.c']
|
||||
|
||||
if (rtconfig.PLATFORM == 'armcc' or rtconfig.PLATFORM == 'iar') and rtconfig.ARCH != 'sim' :
|
||||
group = DefineGroup('libc', src, depend = [''], CPPPATH = CPPPATH)
|
||||
|
||||
Return('group')
|
||||
|
|
|
|||
|
|
@ -1,88 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2006-2018, RT-Thread Development Team
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2018-10-26 zylx first version
|
||||
*/
|
||||
|
||||
#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined (__IAR_SYSTEMS_ICC__)
|
||||
#include <sys/time.h>
|
||||
|
||||
/* seconds per day */
|
||||
#define SPD 24*60*60
|
||||
|
||||
/* days per month -- nonleap! */
|
||||
const short __spm[13] =
|
||||
{
|
||||
0,
|
||||
(31),
|
||||
(31 + 28),
|
||||
(31 + 28 + 31),
|
||||
(31 + 28 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31),
|
||||
};
|
||||
|
||||
int __isleap(int year)
|
||||
{
|
||||
/* every fourth year is a leap year except for century years that are
|
||||
* not divisible by 400. */
|
||||
/* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */
|
||||
return (!(year % 4) && ((year % 100) || !(year % 400)));
|
||||
}
|
||||
|
||||
/**
|
||||
* This function will convert Time (Restartable)
|
||||
*
|
||||
* @param timep the timestamp
|
||||
* @param the structure to stores information
|
||||
*
|
||||
* @return the structure to stores information
|
||||
*
|
||||
*/
|
||||
struct tm *gmtime_r(const time_t *timep, struct tm *r)
|
||||
{
|
||||
time_t i;
|
||||
register time_t work = *timep % (SPD);
|
||||
r->tm_sec = work % 60;
|
||||
work /= 60;
|
||||
r->tm_min = work % 60;
|
||||
r->tm_hour = work / 60;
|
||||
work = *timep / (SPD);
|
||||
r->tm_wday = (4 + work) % 7;
|
||||
for (i = 1970;; ++i)
|
||||
{
|
||||
register time_t k = __isleap(i) ? 366 : 365;
|
||||
if (work >= k)
|
||||
work -= k;
|
||||
else
|
||||
break;
|
||||
}
|
||||
r->tm_year = i - 1900;
|
||||
r->tm_yday = work;
|
||||
|
||||
r->tm_mday = 1;
|
||||
if (__isleap(i) && (work > 58))
|
||||
{
|
||||
if (work == 59)
|
||||
r->tm_mday = 2; /* 29.2. */
|
||||
work -= 1;
|
||||
}
|
||||
|
||||
for (i = 11; i && (__spm[i] > work); --i)
|
||||
;
|
||||
r->tm_mon = i;
|
||||
r->tm_mday += work - __spm[i];
|
||||
return r;
|
||||
}
|
||||
#endif /* end of __CC_ARM or __CLANG_ARM or __IAR_SYSTEMS_ICC__ */
|
||||
|
||||
|
|
@ -0,0 +1,343 @@
|
|||
/*
|
||||
* Copyright (c) 2006-2018, RT-Thread Development Team
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
* 2019-08-21 zhangjun copy from minilibc
|
||||
*/
|
||||
|
||||
#if defined(__CC_ARM) || defined(__CLANG_ARM) || defined (__IAR_SYSTEMS_ICC__)
|
||||
#include <time.h>
|
||||
#include <rtthread.h>
|
||||
|
||||
/* seconds per day */
|
||||
#define SPD 24*60*60
|
||||
|
||||
|
||||
/* days per month -- nonleap! */
|
||||
const short __spm[13] =
|
||||
{
|
||||
0,
|
||||
(31),
|
||||
(31 + 28),
|
||||
(31 + 28 + 31),
|
||||
(31 + 28 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30),
|
||||
(31 + 28 + 31 + 30 + 31 + 30 + 31 + 31 + 30 + 31 + 30 + 31),
|
||||
};
|
||||
static long int timezone;
|
||||
static const char days[] = "Sun Mon Tue Wed Thu Fri Sat ";
|
||||
static const char months[] = "Jan Feb Mar Apr May Jun Jul Aug Sep Oct Nov Dec ";
|
||||
|
||||
/*
|
||||
* Structure returned by gettimeofday(2) system call,
|
||||
* and used in other calls.
|
||||
*/
|
||||
struct timeval {
|
||||
long tv_sec; /* seconds */
|
||||
long tv_usec; /* and microseconds */
|
||||
};
|
||||
|
||||
/* seconds per day */
|
||||
#define SPD 24*60*60
|
||||
|
||||
int __isleap(int year)
|
||||
{
|
||||
/* every fourth year is a leap year except for century years that are
|
||||
* not divisible by 400. */
|
||||
/* return (year % 4 == 0 && (year % 100 != 0 || year % 400 == 0)); */
|
||||
return (!(year % 4) && ((year % 100) || !(year % 400)));
|
||||
}
|
||||
|
||||
struct tm *gmtime_r(const time_t *timep, struct tm *r)
|
||||
{
|
||||
time_t i;
|
||||
register time_t work = *timep % (SPD);
|
||||
r->tm_sec = work % 60;
|
||||
work /= 60;
|
||||
r->tm_min = work % 60;
|
||||
r->tm_hour = work / 60;
|
||||
work = *timep / (SPD);
|
||||
r->tm_wday = (4 + work) % 7;
|
||||
for (i = 1970;; ++i)
|
||||
{
|
||||
register time_t k = __isleap(i) ? 366 : 365;
|
||||
if (work >= k)
|
||||
work -= k;
|
||||
else
|
||||
break;
|
||||
}
|
||||
r->tm_year = i - 1900;
|
||||
r->tm_yday = work;
|
||||
|
||||
r->tm_mday = 1;
|
||||
if (__isleap(i) && (work > 58))
|
||||
{
|
||||
if (work == 59)
|
||||
r->tm_mday = 2; /* 29.2. */
|
||||
work -= 1;
|
||||
}
|
||||
|
||||
for (i = 11; i && (__spm[i] > work); --i)
|
||||
;
|
||||
r->tm_mon = i;
|
||||
r->tm_mday += work - __spm[i];
|
||||
return r;
|
||||
}
|
||||
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#if _DLIB_TIME_USES_64
|
||||
struct tm* __gmtime64(const time_t* t)
|
||||
#else
|
||||
struct tm* __gmtime32(const time_t* t)
|
||||
#endif
|
||||
#else
|
||||
struct tm* gmtime(const time_t* t)
|
||||
#endif
|
||||
{
|
||||
static struct tm tmp;
|
||||
return gmtime_r(t, &tmp);
|
||||
}
|
||||
|
||||
/*TODO timezone is not supprt now */
|
||||
struct tm* localtime_r(const time_t* t, struct tm* r)
|
||||
{
|
||||
return gmtime_r(t, r);
|
||||
}
|
||||
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#if _DLIB_TIME_USES_64
|
||||
struct tm* __localtime64(const time_t* t)
|
||||
#else
|
||||
struct tm* __localtime32(const time_t* t)
|
||||
#endif
|
||||
#else
|
||||
struct tm* localtime(const time_t* t)
|
||||
#endif
|
||||
{
|
||||
static struct tm tmp;
|
||||
return localtime_r(t, &tmp);
|
||||
}
|
||||
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#if _DLIB_TIME_USES_64
|
||||
time_t __mktime64(struct tm * const t)
|
||||
#else
|
||||
time_t __mktime32(struct tm * const t)
|
||||
#endif
|
||||
#else
|
||||
time_t mktime(struct tm * const t)
|
||||
#endif
|
||||
{
|
||||
register time_t day;
|
||||
register time_t i;
|
||||
register time_t years = t->tm_year - 70;
|
||||
|
||||
if (t->tm_sec > 60)
|
||||
{
|
||||
t->tm_min += t->tm_sec / 60;
|
||||
t->tm_sec %= 60;
|
||||
}
|
||||
if (t->tm_min > 60)
|
||||
{
|
||||
t->tm_hour += t->tm_min / 60;
|
||||
t->tm_min %= 60;
|
||||
}
|
||||
if (t->tm_hour > 24)
|
||||
{
|
||||
t->tm_mday += t->tm_hour / 24;
|
||||
t->tm_hour %= 24;
|
||||
}
|
||||
if (t->tm_mon > 12)
|
||||
{
|
||||
t->tm_year += t->tm_mon / 12;
|
||||
t->tm_mon %= 12;
|
||||
}
|
||||
while (t->tm_mday > __spm[1 + t->tm_mon])
|
||||
{
|
||||
if (t->tm_mon == 1 && __isleap(t->tm_year + 1900))
|
||||
{
|
||||
--t->tm_mday;
|
||||
}
|
||||
t->tm_mday -= __spm[t->tm_mon];
|
||||
++t->tm_mon;
|
||||
if (t->tm_mon > 11)
|
||||
{
|
||||
t->tm_mon = 0;
|
||||
++t->tm_year;
|
||||
}
|
||||
}
|
||||
|
||||
if (t->tm_year < 70)
|
||||
return (time_t) - 1;
|
||||
|
||||
/* Days since 1970 is 365 * number of years + number of leap years since 1970 */
|
||||
day = years * 365 + (years + 1) / 4;
|
||||
|
||||
/* After 2100 we have to substract 3 leap years for every 400 years
|
||||
This is not intuitive. Most mktime implementations do not support
|
||||
dates after 2059, anyway, so we might leave this out for it's
|
||||
bloat. */
|
||||
if (years >= 131)
|
||||
{
|
||||
years -= 131;
|
||||
years /= 100;
|
||||
day -= (years >> 2) * 3 + 1;
|
||||
if ((years &= 3) == 3)
|
||||
years--;
|
||||
day -= years;
|
||||
}
|
||||
|
||||
day += t->tm_yday = __spm[t->tm_mon] + t->tm_mday - 1 +
|
||||
(__isleap(t->tm_year + 1900) & (t->tm_mon > 1));
|
||||
|
||||
/* day is now the number of days since 'Jan 1 1970' */
|
||||
i = 7;
|
||||
t->tm_wday = (day + 4) % i; /* Sunday=0, Monday=1, ..., Saturday=6 */
|
||||
|
||||
i = 24;
|
||||
day *= i;
|
||||
i = 60;
|
||||
return ((day + t->tm_hour) * i + t->tm_min) * i + t->tm_sec;
|
||||
}
|
||||
|
||||
static void num2str(char *c, int i)
|
||||
{
|
||||
c[0] = i / 10 + '0';
|
||||
c[1] = i % 10 + '0';
|
||||
}
|
||||
|
||||
char* asctime_r(const struct tm *t, char *buf)
|
||||
{
|
||||
/* "Wed Jun 30 21:49:08 1993\n" */
|
||||
*(int*) buf = *(int*) (days + (t->tm_wday << 2));
|
||||
*(int*) (buf + 4) = *(int*) (months + (t->tm_mon << 2));
|
||||
num2str(buf + 8, t->tm_mday);
|
||||
if (buf[8] == '0')
|
||||
buf[8] = ' ';
|
||||
buf[10] = ' ';
|
||||
num2str(buf + 11, t->tm_hour);
|
||||
buf[13] = ':';
|
||||
num2str(buf + 14, t->tm_min);
|
||||
buf[16] = ':';
|
||||
num2str(buf + 17, t->tm_sec);
|
||||
buf[19] = ' ';
|
||||
num2str(buf + 20, (t->tm_year + 1900) / 100);
|
||||
num2str(buf + 22, (t->tm_year + 1900) % 100);
|
||||
buf[24] = '\n';
|
||||
return buf;
|
||||
}
|
||||
|
||||
char* asctime(const struct tm *timeptr)
|
||||
{
|
||||
static char buf[25];
|
||||
return asctime_r(timeptr, buf);
|
||||
}
|
||||
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#if _DLIB_TIME_USES_64
|
||||
char* __ctime64(const time_t *timep)
|
||||
#else
|
||||
char* __ctime32(const time_t *timep)
|
||||
#endif
|
||||
#else
|
||||
char* ctime(const time_t *timep)
|
||||
#endif
|
||||
{
|
||||
return asctime(localtime(timep));
|
||||
}
|
||||
|
||||
#ifdef RT_USING_DEVICE
|
||||
int gettimeofday(struct timeval *tp, void *ignore)
|
||||
{
|
||||
time_t time;
|
||||
rt_device_t device;
|
||||
|
||||
device = rt_device_find("rtc");
|
||||
RT_ASSERT(device != RT_NULL);
|
||||
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
|
||||
if (tp != RT_NULL)
|
||||
{
|
||||
tp->tv_sec = time;
|
||||
tp->tv_usec = 0;
|
||||
}
|
||||
|
||||
return time;
|
||||
}
|
||||
#endif
|
||||
|
||||
#ifndef _gettimeofday
|
||||
/* Dummy function when hardware do not have RTC */
|
||||
int _gettimeofday( struct timeval *tv, void *ignore)
|
||||
{
|
||||
tv->tv_sec = 0; // convert to seconds
|
||||
tv->tv_usec = 0; // get remaining microseconds
|
||||
return 0; // return non-zero for error
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Returns the current time.
|
||||
*
|
||||
* @param time_t * t the timestamp pointer, if not used, keep NULL.
|
||||
*
|
||||
* @return time_t return timestamp current.
|
||||
*
|
||||
*/
|
||||
/* for IAR 6.2 later Compiler */
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
#pragma module_name = "?time"
|
||||
#if _DLIB_TIME_USES_64
|
||||
time_t __time64(time_t *t)
|
||||
#else
|
||||
time_t __time32(time_t *t)
|
||||
#endif
|
||||
#else
|
||||
time_t time(time_t *t)
|
||||
#endif
|
||||
{
|
||||
time_t time_now = 0;
|
||||
|
||||
#ifdef RT_USING_RTC
|
||||
static rt_device_t device = RT_NULL;
|
||||
|
||||
/* optimization: find rtc device only first. */
|
||||
if (device == RT_NULL)
|
||||
{
|
||||
device = rt_device_find("rtc");
|
||||
}
|
||||
|
||||
/* read timestamp from RTC device. */
|
||||
if (device != RT_NULL)
|
||||
{
|
||||
if (rt_device_open(device, 0) == RT_EOK)
|
||||
{
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
|
||||
rt_device_close(device);
|
||||
}
|
||||
}
|
||||
#endif /* RT_USING_RTC */
|
||||
|
||||
/* if t is not NULL, write timestamp to *t */
|
||||
if (t != RT_NULL)
|
||||
{
|
||||
*t = time_now;
|
||||
}
|
||||
|
||||
return time_now;
|
||||
}
|
||||
|
||||
RT_WEAK clock_t clock(void)
|
||||
{
|
||||
return rt_tick_get();
|
||||
}
|
||||
#endif
|
||||
|
|
@ -1,86 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2006-2018, RT-Thread Development Team
|
||||
*
|
||||
* SPDX-License-Identifier: Apache-2.0
|
||||
*
|
||||
* Change Logs:
|
||||
* Date Author Notes
|
||||
*/
|
||||
#include <sys/time.h>
|
||||
#include <rtthread.h>
|
||||
|
||||
#ifdef RT_USING_DEVICE
|
||||
int gettimeofday(struct timeval *tp, void *ignore)
|
||||
{
|
||||
time_t time;
|
||||
rt_device_t device;
|
||||
|
||||
device = rt_device_find("rtc");
|
||||
RT_ASSERT(device != RT_NULL);
|
||||
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time);
|
||||
if (tp != RT_NULL)
|
||||
{
|
||||
tp->tv_sec = time;
|
||||
tp->tv_usec = 0;
|
||||
}
|
||||
|
||||
return time;
|
||||
}
|
||||
#endif
|
||||
|
||||
/**
|
||||
* Returns the current time.
|
||||
*
|
||||
* @param time_t * t the timestamp pointer, if not used, keep NULL.
|
||||
*
|
||||
* @return time_t return timestamp current.
|
||||
*
|
||||
*/
|
||||
#pragma module_name = "?time"
|
||||
#if _DLIB_TIME_USES_64
|
||||
time_t __time64(time_t *t)
|
||||
#else
|
||||
/* for IAR 6.2 later Compiler */
|
||||
#if defined (__IAR_SYSTEMS_ICC__) && (__VER__) >= 6020000
|
||||
time_t __time32(time_t *t)
|
||||
#else
|
||||
time_t time(time_t *t)
|
||||
#endif
|
||||
#endif
|
||||
{
|
||||
time_t time_now = 0;
|
||||
|
||||
#ifdef RT_USING_RTC
|
||||
static rt_device_t device = RT_NULL;
|
||||
|
||||
/* optimization: find rtc device only first. */
|
||||
if (device == RT_NULL)
|
||||
{
|
||||
device = rt_device_find("rtc");
|
||||
}
|
||||
|
||||
/* read timestamp from RTC device. */
|
||||
if (device != RT_NULL)
|
||||
{
|
||||
if (rt_device_open(device, 0) == RT_EOK)
|
||||
{
|
||||
rt_device_control(device, RT_DEVICE_CTRL_RTC_GET_TIME, &time_now);
|
||||
rt_device_close(device);
|
||||
}
|
||||
}
|
||||
#endif /* RT_USING_RTC */
|
||||
|
||||
/* if t is not NULL, write timestamp to *t */
|
||||
if (t != RT_NULL)
|
||||
{
|
||||
*t = time_now;
|
||||
}
|
||||
|
||||
return time_now;
|
||||
}
|
||||
|
||||
RT_WEAK clock_t clock(void)
|
||||
{
|
||||
return rt_tick_get();
|
||||
}
|
||||
Loading…
Reference in New Issue