Skip to content

Commit 764229b

Browse files
committed
Fix syscall assertion when input file does not exist
JerryScript-DCO-1.0-Signed-off-by: Dániel Bátyai dbatyai@inf.u-szeged.hu
1 parent b78f5a5 commit 764229b

File tree

3 files changed

+9
-59
lines changed

3 files changed

+9
-59
lines changed

jerry-libc/target/darwin/jerry-libc-target.c

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333

3434
LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___))
3535

36-
/**
37-
* Exit program with ERR_SYSCALL if syscall_ret_val is negative
38-
*/
39-
#define LIBC_EXIT_ON_ERROR(syscall_ret_val) \
40-
if ((syscall_ret_val) < 0) \
41-
{ \
42-
libc_fatal ("Syscall", __FILE__, __func__, __LINE__); \
43-
}
44-
4536
static long int syscall_0 (long int syscall_no);
4637
static long int syscall_1 (long int syscall_no, long int arg1);
4738
static long int syscall_2 (long int syscall_no, long int arg1, long int arg2);
@@ -60,11 +51,7 @@ extern long int syscall_3_asm (long int syscall_no, long int arg1, long int arg2
6051
static __attr_noinline___ long int
6152
syscall_0 (long int syscall_no) /**< syscall number */
6253
{
63-
long int ret = syscall_0_asm (syscall_no);
64-
65-
LIBC_EXIT_ON_ERROR (ret);
66-
67-
return ret;
54+
return syscall_0_asm (syscall_no);
6855
} /* syscall_0 */
6956

7057
/**
@@ -76,11 +63,7 @@ static __attr_noinline___ long int
7663
syscall_1 (long int syscall_no, /**< syscall number */
7764
long int arg1) /**< argument */
7865
{
79-
long int ret = syscall_1_asm (syscall_no, arg1);
80-
81-
LIBC_EXIT_ON_ERROR (ret);
82-
83-
return ret;
66+
return syscall_1_asm (syscall_no, arg1);
8467
} /* syscall_1 */
8568

8669
/**
@@ -93,11 +76,7 @@ syscall_2 (long int syscall_no, /**< syscall number */
9376
long int arg1, /**< first argument */
9477
long int arg2) /**< second argument */
9578
{
96-
long int ret = syscall_2_asm (syscall_no, arg1, arg2);
97-
98-
LIBC_EXIT_ON_ERROR (ret);
99-
100-
return ret;
79+
return syscall_2_asm (syscall_no, arg1, arg2);
10180
} /* syscall_2 */
10281

10382
/**
@@ -111,11 +90,7 @@ syscall_3 (long int syscall_no, /**< syscall number */
11190
long int arg2, /**< second argument */
11291
long int arg3) /**< third argument */
11392
{
114-
long int ret = syscall_3_asm (syscall_no, arg1, arg2, arg3);
115-
116-
LIBC_EXIT_ON_ERROR (ret);
117-
118-
return ret;
93+
return syscall_3_asm (syscall_no, arg1, arg2, arg3);
11994
} /* syscall_3 */
12095

12196
/** Output of character. Writes the character c, cast to an unsigned char, to stdout. */

jerry-libc/target/linux/jerry-libc-target.c

Lines changed: 4 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -33,15 +33,6 @@
3333

3434
LIBC_UNREACHABLE_STUB_FOR (int raise (int sig_no __attr_unused___))
3535

36-
/**
37-
* Exit program with ERR_SYSCALL if syscall_ret_val is negative
38-
*/
39-
#define LIBC_EXIT_ON_ERROR(syscall_ret_val) \
40-
if ((syscall_ret_val) < 0) \
41-
{ \
42-
libc_fatal ("Syscall", __FILE__, __func__, __LINE__); \
43-
}
44-
4536
static long int syscall_0 (long int syscall_no);
4637
static long int syscall_1 (long int syscall_no, long int arg1);
4738
static long int syscall_2 (long int syscall_no, long int arg1, long int arg2);
@@ -60,11 +51,7 @@ extern long int syscall_3_asm (long int syscall_no, long int arg1, long int arg2
6051
static __attr_noinline___ long int
6152
syscall_0 (long int syscall_no) /**< syscall number */
6253
{
63-
long int ret = syscall_0_asm (syscall_no);
64-
65-
LIBC_EXIT_ON_ERROR (ret);
66-
67-
return ret;
54+
return syscall_0_asm (syscall_no);
6855
} /* syscall_0 */
6956

7057
/**
@@ -76,11 +63,7 @@ static __attr_noinline___ long int
7663
syscall_1 (long int syscall_no, /**< syscall number */
7764
long int arg1) /**< argument */
7865
{
79-
long int ret = syscall_1_asm (syscall_no, arg1);
80-
81-
LIBC_EXIT_ON_ERROR (ret);
82-
83-
return ret;
66+
return syscall_1_asm (syscall_no, arg1);
8467
} /* syscall_1 */
8568

8669
/**
@@ -93,11 +76,7 @@ syscall_2 (long int syscall_no, /**< syscall number */
9376
long int arg1, /**< first argument */
9477
long int arg2) /**< second argument */
9578
{
96-
long int ret = syscall_2_asm (syscall_no, arg1, arg2);
97-
98-
LIBC_EXIT_ON_ERROR (ret);
99-
100-
return ret;
79+
return syscall_2_asm (syscall_no, arg1, arg2);
10180
} /* syscall_2 */
10281

10382
/**
@@ -111,11 +90,7 @@ syscall_3 (long int syscall_no, /**< syscall number */
11190
long int arg2, /**< second argument */
11291
long int arg3) /**< third argument */
11392
{
114-
long int ret = syscall_3_asm (syscall_no, arg1, arg2, arg3);
115-
116-
LIBC_EXIT_ON_ERROR (ret);
117-
118-
return ret;
93+
return syscall_3_asm (syscall_no, arg1, arg2, arg3);
11994
} /* syscall_3 */
12095

12196
/** Output of character. Writes the character c, cast to an unsigned char, to stdout. */

main-unix.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ read_sources (const char *script_file_names[],
9696

9797
if (i < files_count)
9898
{
99-
JERRY_ERROR_MSG ("Failed to read script N%d\n", i + 1);
99+
JERRY_ERROR_MSG ("Failed to open file: %s\n", script_file_names[i]);
100100

101101
return NULL;
102102
}

0 commit comments

Comments
 (0)