Skip to content

Commit

Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Speculatively removing jerry_port_console from all non-default targets
Browse files Browse the repository at this point in the history
Most targets implemented `jerry_port_console` for the sake of the
engine only; in those targets the removal was trivial. Where the
function was called from the embedder application as well, the
calls were replaced with equivalents (e.g., `printf`, `printk`).

NOTE: This patch still leaves several targets without a JS `print`
implementation.

JerryScript-DCO-1.0-Signed-off-by: Akos Kiss akiss@inf.u-szeged.hu
akosthekiss committed May 2, 2017

Verified

This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
1 parent 0215b26 commit 3f63ae1
Showing 8 changed files with 19 additions and 122 deletions.
13 changes: 7 additions & 6 deletions targets/curie_bsp/jerry_app/quark/main.c
Original file line number Diff line number Diff line change
@@ -36,6 +36,7 @@
#include "zephyr.h"
#include "microkernel/task.h"
#include "os/os.h"
#include "misc/printk.h"

static T_QUEUE queue;

@@ -51,17 +52,17 @@ void jerry_resolve_error (jerry_value_t ret_value)
jerry_char_t *err_str_buf = (jerry_char_t *) balloc (err_str_size, NULL);
jerry_size_t sz = jerry_string_to_char_buffer (err_str_val, err_str_buf, err_str_size);
err_str_buf[sz] = 0;
jerry_port_console ("Script Error: unhandled exception: %s\n", err_str_buf);
printk ("Script Error: unhandled exception: %s\n", err_str_buf);
bfree(err_str_buf);
jerry_release_value (err_str_val);
}
}

void help ()
{
jerry_port_console ("Usage:\n");
jerry_port_console ("js e 'JavaScript Command'\n");
jerry_port_console ("eg. js e print ('Hello World');\n");
printk ("Usage:\n");
printk ("js e 'JavaScript Command'\n");
printk ("eg. js e print ('Hello World');\n");
}

void eval_jerry_script (int argc, char *argv[], struct tcmd_handler_ctx *ctx)
@@ -79,7 +80,7 @@ void eval_jerry_script (int argc, char *argv[], struct tcmd_handler_ctx *ctx)
size_t *str_lens = (size_t *) balloc ((argc - 2) * sizeof(size_t), &err);
if (str_lens == NULL || err != E_OS_OK)
{
jerry_port_console ("%s: allocate memory failed!", __func__);
printk ("%s: allocate memory failed!", __func__);
TCMD_RSP_ERROR (ctx, NULL);
return;
}
@@ -92,7 +93,7 @@ void eval_jerry_script (int argc, char *argv[], struct tcmd_handler_ctx *ctx)
char *buffer = (char *) balloc (str_total_length, &err);
if (buffer == NULL || err != E_OS_OK)
{
jerry_port_console ("%s: allocate memory failed!", __func__);
printk ("%s: allocate memory failed!", __func__);
TCMD_RSP_ERROR (ctx, NULL);
return;
}
18 changes: 0 additions & 18 deletions targets/curie_bsp/source/curie-bsp-port.c
Original file line number Diff line number Diff line change
@@ -20,24 +20,6 @@
#include <stddef.h>
#include "jerryscript-port.h"

/**
* Provide console message implementation for the engine.
* Curie BSP implementation
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
char buf[256];
int length = 0;
va_list args;
va_start (args, format);
length = vsnprintf (buf, 256, format, args);
buf[length] = '\0';
printk ("%s", buf);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
* Curie BSP implementation
13 changes: 0 additions & 13 deletions targets/esp8266/user/jerry_port.c
Original file line number Diff line number Diff line change
@@ -20,19 +20,6 @@
#include "jerry-core/jerryscript-port.h"
int ets_putc (int);

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
ets_vprintf (ets_putc, format, args);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
*/
15 changes: 1 addition & 14 deletions targets/mbed/source/port/jerry_port.c
Original file line number Diff line number Diff line change
@@ -22,19 +22,6 @@

#include "mbed-hal/us_ticker_api.h"

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vfprintf (stdout, format, args);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
*/
@@ -62,7 +49,7 @@ jerry_port_fatal (jerry_fatal_code_t code) /**< fatal code enum item */

/**
* Implementation of jerry_port_get_time_zone.
*
*
* @return true - if success
*/
bool
20 changes: 0 additions & 20 deletions targets/mbedos5/source/jerry_port_mbed.c
Original file line number Diff line number Diff line change
@@ -22,26 +22,6 @@

#include "us_ticker_api.h"

#ifndef JSMBED_OVERRIDE_JERRY_PORT_CONSOLE
/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vfprintf (stdout, format, args);
va_end (args);

if (strlen (format) == 1 && format[0] == 0x0a) /* line feed (\n) */
{
printf ("\r"); /* add CR for proper display in serial monitors */
}
} /* jerry_port_console */
#endif /* JSMBED_OVERRIDE_JERRY_PORT_CONSOLE */

#ifndef JSMBED_OVERRIDE_JERRY_PORT_LOG
/**
* Provide log message implementation for the engine.
35 changes: 11 additions & 24 deletions targets/nuttx-stm32f4/jerry_main.c
Original file line number Diff line number Diff line change
@@ -44,16 +44,16 @@
static void
print_help (char *name)
{
jerry_port_console ("Usage: %s [OPTION]... [FILE]...\n"
"\n"
"Options:\n"
" --log-level [0-3]\n"
" --mem-stats\n"
" --mem-stats-separate\n"
" --show-opcodes\n"
" --start-debug-server\n"
"\n",
name);
printf ("Usage: %s [OPTION]... [FILE]...\n"
"\n"
"Options:\n"
" --log-level [0-3]\n"
" --mem-stats\n"
" --mem-stats-separate\n"
" --show-opcodes\n"
" --start-debug-server\n"
"\n",
name);
} /* print_help */

/**
@@ -449,7 +449,7 @@ int jerry_main (int argc, char *argv[])

if (files_counter == 0)
{
jerry_port_console ("No input files, running a hello world demo:\n");
printf ("No input files, running a hello world demo:\n");
char *source_p = "var a = 3.5; print('Hello world ' + (a + 1.5) + ' times from JerryScript')";

jerry_run_simple ((jerry_char_t *) source_p, strlen (source_p), flags);
@@ -522,19 +522,6 @@ void jerry_port_fatal (jerry_fatal_code_t code)
exit (1);
} /* jerry_port_fatal */

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vfprintf (stdout, format, args);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
*/
14 changes: 0 additions & 14 deletions targets/tizenrt-artik05x/apps/jerryscript/jerry_port.c
Original file line number Diff line number Diff line change
@@ -29,19 +29,6 @@ void jerry_port_fatal (jerry_fatal_code_t code)
exit (code);
} /* jerry_port_fatal */

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vprintf (format, args);
va_end (args);
} /* jerry_port_console */

/**
* Provide log message implementation for the engine.
*/
@@ -110,4 +97,3 @@ longjmp (jmp_buf buf, int value)
(void)(value); // suppress unused param warning
__builtin_longjmp (buf, 1);
} /* longjmp */

13 changes: 0 additions & 13 deletions targets/zephyr/src/jerry-port.c
Original file line number Diff line number Diff line change
@@ -19,19 +19,6 @@

#include "jerryscript-port.h"

/**
* Provide console message implementation for the engine.
*/
void
jerry_port_console (const char *format, /**< format string */
...) /**< parameters */
{
va_list args;
va_start (args, format);
vfprintf (stdout, format, args);
va_end (args);
} /* jerry_port_console */


/**
* Provide log message implementation for the engine.

0 comments on commit 3f63ae1

Please sign in to comment.