From 4de864de0e3c5d27adc995128d854b3d7c86d825 Mon Sep 17 00:00:00 2001 From: Gavin1012 Date: Fri, 16 Apr 2021 10:33:58 +0800 Subject: [PATCH 1/3] modify get_time function --- jerry-port/default/default-date.c | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/jerry-port/default/default-date.c b/jerry-port/default/default-date.c index edc6c991..f61db957 100755 --- a/jerry-port/default/default-date.c +++ b/jerry-port/default/default-date.c @@ -34,6 +34,7 @@ #ifdef JERRY_FOR_IAR_CONFIG #define _BSD_SOURCE #include "time.h" +#include "sys/time.h" #include "config-gt.h" #include "config-jupiter.h" @@ -126,21 +127,14 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms, /**< ms since */ double jerry_port_get_current_time (void) { -#ifdef __GNUC__ +#if defined (__GNUC__) || defined (JERRY_FOR_IAR_CONFIG) struct timeval tv; if (gettimeofday (&tv, NULL) == 0) { return ((double) tv.tv_sec) * 1000.0 + ((double) tv.tv_usec) / 1000.0; } -#endif /* __GNUC__ */ - -#ifdef JERRY_FOR_IAR_CONFIG - time_t millis = 0; - if (time (&millis) != OHOS_FAILURE) { - return (double) millis * 1000.0; - } -#endif +#endif /* __GNUC__ || JERRY_FOR_IAR_CONFIG */ #ifdef _WIN32 time_t ltime; -- Gitee From bdafd58eedcd6856525305c0c9aaf464b26607de Mon Sep 17 00:00:00 2001 From: Gavin1012 Date: Sat, 8 May 2021 11:58:12 +0800 Subject: [PATCH 2/3] update get_local_time and time_zone for Jupiter --- jerry-port/default/default-date.c | 23 ++++++++--------------- 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/jerry-port/default/default-date.c b/jerry-port/default/default-date.c index f61db957..61ea6487 100755 --- a/jerry-port/default/default-date.c +++ b/jerry-port/default/default-date.c @@ -33,17 +33,12 @@ #ifdef JERRY_FOR_IAR_CONFIG #define _BSD_SOURCE -#include "time.h" +/* the "sys/time.h" should be put ahead of "time.h" so that the right implementation for gettimeofday can be found. */ #include "sys/time.h" +#include "time.h" #include "config-gt.h" #include "config-jupiter.h" - -#define GET_SIGN_BIT(x) ((x) >> sizeof (x) * 8 - 1) -#define GET_TIMEZONE_HOUR(timeZone) (((timeZone) >> 8) & 0x7F) -#define GET_TIMEZONE_MIN(timeZone) ((timeZone) & 0xFF) -#define HOUR_TO_MIN 60 -#define MIN_TO_SEC 60 -#endif +#endif /* JERRY_FOR_IAR_CONFIG */ #ifdef _WIN32 /* https://support.microsoft.com/en-us/help/167296/how-to-convert-a-unix-time-t-to-a-win32-filetime-or-systemtime */ @@ -78,9 +73,7 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms, /**< ms since } return ((double) tm.tm_gmtoff) * 1000; #else /* !HAVE_TM_GMTOFF */ -#ifdef JERRY_FOR_IAR_CONFIG - // We don't use unix_ms and is_utc, since timezone cannot be computed - // as a function of given time. +#ifdef JERRY_IAR_JUPITER struct tm tm; time_t now = (time_t) (unix_ms / 1000); localtime_r (&now, &tm); @@ -90,7 +83,7 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms, /**< ms since localtime_r (&now, &tm); } return ((double) tm.tm_gmtoff) * 1000; -#else +#else /* !JERRY_IAR_JUPITER */ (void) unix_ms; (void) is_utc; #ifdef _WIN32 @@ -127,14 +120,14 @@ double jerry_port_get_local_time_zone_adjustment (double unix_ms, /**< ms since */ double jerry_port_get_current_time (void) { -#if defined (__GNUC__) || defined (JERRY_FOR_IAR_CONFIG) - struct timeval tv; +#if defined (__GNUC__) || defined (JERRY_IAR_JUPITER) + struct timeval tv = {0}; if (gettimeofday (&tv, NULL) == 0) { return ((double) tv.tv_sec) * 1000.0 + ((double) tv.tv_usec) / 1000.0; } -#endif /* __GNUC__ || JERRY_FOR_IAR_CONFIG */ +#endif /* __GNUC__ || JERRY_IAR_JUPITER */ #ifdef _WIN32 time_t ltime; -- Gitee From 1508dd8b37e522145969788fddd3651931c5c7ae Mon Sep 17 00:00:00 2001 From: Gavin1012 Date: Wed, 2 Jun 2021 11:42:41 +0800 Subject: [PATCH 3/3] enable debug points in IDE's init func on MAC platform Signed-off-by: Gavin1012 --- jerry-core/debugger/debugger.c | 8 ++++++++ jerry-port/default/default-io.c | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/jerry-core/debugger/debugger.c b/jerry-core/debugger/debugger.c index aa4a309d..54fd7cf3 100644 --- a/jerry-core/debugger/debugger.c +++ b/jerry-core/debugger/debugger.c @@ -24,6 +24,9 @@ #include "jcontext.h" #include "jerryscript-port.h" #include "lit-char-helpers.h" +#if defined (__APPLE__) + #include +#endif #if ENABLED (JERRY_DEBUGGER) @@ -1165,6 +1168,11 @@ jerry_debugger_receive (jerry_debugger_uint8_data_t **message_data_p) /**< [out] while (true) { + #if defined (__APPLE__) + // wait at here for 0.5ms + usleep(500) + #endif /* __APPLE__ */ + jerry_debugger_transport_receive_context_t context; if (!jerry_debugger_transport_receive (&context)) { diff --git a/jerry-port/default/default-io.c b/jerry-port/default/default-io.c index 0788ae69..a009ae4b 100644 --- a/jerry-port/default/default-io.c +++ b/jerry-port/default/default-io.c @@ -94,7 +94,7 @@ jerry_port_log (jerry_log_level_t level, /**< message log level */ JERRY_VLA (char, buffer, length + 1); vsnprintf (buffer, (size_t) length + 1, format, args); - fprintf (stderr, "%s", buffer); + fprintf (stderr, "[JERRYSCRIPT]%s", buffer); jerry_debugger_send_log (level, (jerry_char_t *) buffer, (jerry_size_t) length); } else -- Gitee