1berry/ruby
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Refactor mjit_worker command line with C99

Browse Source 
Mostly non-constatnt array initializer, and mixed declarations and code.
This commit is contained in:
Takashi Kokubun 2019-07-14 12:53:39 +09:00
parent 369ff79394
commit 4402c66978
No known key found for this signature in database
GPG Key ID: 6FFC433B12EE23DD
1 changed files with 17 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
mjit_worker.c
View File

@ -609,7 +609,6 @@ static int
exec_process(const char *path, char *const argv[]) exec_process(const char *path, char *const argv[])
{ {
int stat, exit_code = -2; int stat, exit_code = -2;
pid_t pid;
rb_vm_t *vm = WAITPID_USE_SIGCHLD ? GET_VM() : 0; rb_vm_t *vm = WAITPID_USE_SIGCHLD ? GET_VM() : 0;
rb_nativethread_cond_t cond; rb_nativethread_cond_t cond;
@ -618,7 +617,7 @@ exec_process(const char *path, char *const argv[])
rb_native_mutex_lock(&vm->waitpid_lock); rb_native_mutex_lock(&vm->waitpid_lock);
} }
pid = start_process(path, argv); pid_t pid = start_process(path, argv);
for (;pid > 0;) { for (;pid > 0;) {
pid_t r = vm ? ruby_waitpid_locked(vm, pid, &stat, 0, &cond) pid_t r = vm ? ruby_waitpid_locked(vm, pid, &stat, 0, &cond)
: waitpid(pid, &stat, 0); : waitpid(pid, &stat, 0);
@ -670,10 +669,8 @@ remove_so_file(const char *so_file, struct rb_mjit_unit *unit)
static bool static bool
compile_c_to_so(const char *c_file, const char *so_file) compile_c_to_so(const char *c_file, const char *so_file)
{ {
int exit_code;
const char *files[] = { NULL, NULL, NULL, NULL, NULL, NULL, "-link", libruby_pathflag, NULL }; const char *files[] = { NULL, NULL, NULL, NULL, NULL, NULL, "-link", libruby_pathflag, NULL };
char **args; char *p;
char *p, *obj_file;
// files[0] = "-Fe*.dll" // files[0] = "-Fe*.dll"
files[0] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fe") + strlen(so_file) + 1)); files[0] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fe") + strlen(so_file) + 1));
@ -684,7 +681,7 @@ compile_c_to_so(const char *c_file, const char *so_file)
// files[1] = "-Fo*.obj" // files[1] = "-Fo*.obj"
// We don't need .obj file, but it's somehow created to cwd without -Fo and we want to control the output directory. // We don't need .obj file, but it's somehow created to cwd without -Fo and we want to control the output directory.
files[1] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fo") + strlen(so_file) - rb_strlen_lit(DLEXT) + rb_strlen_lit(".obj") + 1)); files[1] = p = alloca(sizeof(char) * (rb_strlen_lit("-Fo") + strlen(so_file) - rb_strlen_lit(DLEXT) + rb_strlen_lit(".obj") + 1));
obj_file = p = append_lit(p, "-Fo"); char *obj_file = p = append_lit(p, "-Fo");
p = append_str2(p, so_file, strlen(so_file) - rb_strlen_lit(DLEXT)); p = append_str2(p, so_file, strlen(so_file) - rb_strlen_lit(DLEXT));
p = append_lit(p, ".obj"); p = append_lit(p, ".obj");
*p = '\0'; *p = '\0';
@ -714,12 +711,12 @@ compile_c_to_so(const char *c_file, const char *so_file)
p = append_lit(p, ".pdb"); p = append_lit(p, ".pdb");
*p = '\0'; *p = '\0';
args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS, char **args = form_args(5, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
files, CC_LIBS, CC_DLDFLAGS_ARGS); files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL) if (args == NULL)
return false; return false;
exit_code = exec_process(cc_path, args); int exit_code = exec_process(cc_path, args);
free(args); free(args);
if (exit_code == 0) { if (exit_code == 0) {
@ -745,7 +742,6 @@ compile_c_to_so(const char *c_file, const char *so_file)
static void static void
make_pch(void) make_pch(void)
{ {
int exit_code;
const char *rest_args[] = { const char *rest_args[] = {
# ifdef __clang__ # ifdef __clang__
"-emit-pch", "-emit-pch",
@ -753,16 +749,12 @@ make_pch(void)
// -nodefaultlibs is a linker flag, but it may affect cc1 behavior on Gentoo, which should NOT be changed on pch: // -nodefaultlibs is a linker flag, but it may affect cc1 behavior on Gentoo, which should NOT be changed on pch:
// https://gitweb.gentoo.org/proj/gcc-patches.git/tree/7.3.0/gentoo/13_all_default-ssp-fix.patch // https://gitweb.gentoo.org/proj/gcc-patches.git/tree/7.3.0/gentoo/13_all_default-ssp-fix.patch
GCC_NOSTDLIB_FLAGS GCC_NOSTDLIB_FLAGS
"-o", NULL, NULL, "-o", pch_file, header_file,
NULL, NULL,
}; };
char **args;
int len = sizeof(rest_args) / sizeof(const char *);
rest_args[len - 2] = header_file;
rest_args[len - 3] = pch_file;
verbose(2, "Creating precompiled header"); verbose(2, "Creating precompiled header");
args = form_args(3, cc_common_args, CC_CODEFLAG_ARGS, rest_args); char **args = form_args(3, cc_common_args, CC_CODEFLAG_ARGS, rest_args);
if (args == NULL) { if (args == NULL) {
mjit_warning("making precompiled header failed on forming args"); mjit_warning("making precompiled header failed on forming args");
CRITICAL_SECTION_START(3, "in make_pch"); CRITICAL_SECTION_START(3, "in make_pch");
@ -771,7 +763,7 @@ make_pch(void)
return; return;
} }
exit_code = exec_process(cc_path, args); int exit_code = exec_process(cc_path, args);
free(args); free(args);
CRITICAL_SECTION_START(3, "in make_pch"); CRITICAL_SECTION_START(3, "in make_pch");
@ -791,26 +783,19 @@ make_pch(void)
static bool static bool
compile_c_to_o(const char *c_file, const char *o_file) compile_c_to_o(const char *c_file, const char *o_file)
{ {
int exit_code;
const char *files[] = { const char *files[] = {
"-o", NULL, NULL, "-o", o_file, c_file,
# ifdef __clang__ # ifdef __clang__
"-include-pch", NULL, "-include-pch", pch_file,
# endif # endif
"-c", NULL "-c", NULL
}; };
char **args;
files[1] = o_file; char **args = form_args(5, cc_common_args, CC_CODEFLAG_ARGS, files, CC_LIBS, CC_DLDFLAGS_ARGS);
files[2] = c_file;
# ifdef __clang__
files[4] = pch_file;
# endif
args = form_args(5, cc_common_args, CC_CODEFLAG_ARGS, files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL) if (args == NULL)
return false; return false;
exit_code = exec_process(cc_path, args); int exit_code = exec_process(cc_path, args);
free(args); free(args);
if (exit_code != 0) if (exit_code != 0)
@ -822,23 +807,20 @@ compile_c_to_o(const char *c_file, const char *o_file)
static bool static bool
link_o_to_so(const char **o_files, const char *so_file) link_o_to_so(const char **o_files, const char *so_file)
{ {
int exit_code;
const char *options[] = { const char *options[] = {
"-o", NULL, "-o", so_file,
# ifdef _WIN32 # ifdef _WIN32
libruby_pathflag, libruby_pathflag,
# endif # endif
NULL NULL
}; };
char **args;
options[1] = so_file; char **args = form_args(6, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS,
args = form_args(6, CC_LDSHARED_ARGS, CC_CODEFLAG_ARGS, options, o_files, CC_LIBS, CC_DLDFLAGS_ARGS);
options, o_files, CC_LIBS, CC_DLDFLAGS_ARGS);
if (args == NULL) if (args == NULL)
return false; return false;
exit_code = exec_process(cc_path, args); int exit_code = exec_process(cc_path, args);
free(args); free(args);
if (exit_code != 0) if (exit_code != 0)