Skip to content

Add qjsc -r flag to output raw bytecode #460

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
Jul 4, 2024
Merged

Add qjsc -r flag to output raw bytecode #460

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
f351905
Add `qjsc -r` flag to output raw bytecode
TooTallNate Jul 3, 2024
220feab
Add help
TooTallNate Jul 3, 2024
93c2e89
Revert formatting changes
TooTallNate Jul 3, 2024
82f22c5
.
TooTallNate Jul 3, 2024
23a47cd
Fix
TooTallNate Jul 3, 2024
3b8f3da
.
TooTallNate Jul 3, 2024
e440af5
Fix
TooTallNate Jul 3, 2024
2d52661
Fix merge conflicts
TooTallNate Jul 3, 2024
02dfbac
Use static var
TooTallNate Jul 3, 2024
391140d
.
TooTallNate Jul 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 30 additions & 19 deletions qjsc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,12 @@
#include "cutils.h"
#include "quickjs-libc.h"

typedef enum {
OUTPUT_C,
OUTPUT_C_MAIN,
OUTPUT_RAW,
} OutputTypeEnum;

typedef struct {
char *name;
char *short_name;
Expand All @@ -54,6 +60,7 @@ typedef struct namelist_t {
static namelist_t cname_list;
static namelist_t cmodule_list;
static namelist_t init_module_list;
static OutputTypeEnum output_type;
static FILE *outfile;
static const char *c_ident_prefix = "qjsc_";
static int strip;
Expand Down Expand Up @@ -171,12 +178,16 @@ static void output_object_code(JSContext *ctx,

namelist_add(&cname_list, c_name, NULL, load_only);

fprintf(fo, "const uint32_t %s_size = %u;\n\n",
c_name, (unsigned int)out_buf_len);
fprintf(fo, "const uint8_t %s[%u] = {\n",
c_name, (unsigned int)out_buf_len);
dump_hex(fo, out_buf, out_buf_len);
fprintf(fo, "};\n\n");
if (output_type == OUTPUT_RAW) {
fwrite(out_buf, 1, out_buf_len, fo);
} else {
fprintf(fo, "const uint32_t %s_size = %u;\n\n",
c_name, (unsigned int)out_buf_len);
fprintf(fo, "const uint8_t %s[%u] = {\n",
c_name, (unsigned int)out_buf_len);
dump_hex(fo, out_buf, out_buf_len);
fprintf(fo, "};\n\n");
}

js_free(ctx, out_buf);
}
Expand Down Expand Up @@ -334,18 +345,14 @@ void help(void)
"-D module_name compile a dynamically loaded module or worker\n"
"-M module_name[,cname] add initialization code for an external C module\n"
"-p prefix set the prefix of the generated C names\n"
"-r output raw bytecode instead of C code\n"
"-s strip the source code, specify twice to also strip debug info\n"
"-S n set the maximum stack size to 'n' bytes (default=%d)\n",
JS_GetVersion(),
JS_DEFAULT_STACK_SIZE);
exit(1);
}

typedef enum {
OUTPUT_C,
OUTPUT_C_MAIN,
} OutputTypeEnum;

int main(int argc, char **argv)
{
int c, i, verbose;
Expand All @@ -355,7 +362,6 @@ int main(int argc, char **argv)
JSRuntime *rt;
JSContext *ctx;
int module;
OutputTypeEnum output_type;
size_t stack_size;
namelist_t dynamic_module_list;

Expand All @@ -374,7 +380,7 @@ int main(int argc, char **argv)
namelist_add(&cmodule_list, "os", "os", 0);

for(;;) {
c = getopt(argc, argv, "ho:N:mn:mxesvM:p:S:D:");
c = getopt(argc, argv, "ho:N:mn:rxesvM:p:S:D:");
if (c == -1)
break;
switch(c) {
Expand Down Expand Up @@ -423,6 +429,9 @@ int main(int argc, char **argv)
case 'p':
c_ident_prefix = optarg;
break;
case 'r':
output_type = OUTPUT_RAW;
break;
case 'S':
stack_size = (size_t)strtod(optarg, NULL);
break;
Expand Down Expand Up @@ -452,15 +461,17 @@ int main(int argc, char **argv)
/* loader for ES6 modules */
JS_SetModuleLoaderFunc(rt, NULL, jsc_module_loader, NULL);

fprintf(fo, "/* File generated automatically by the QuickJS-ng compiler. */\n"
"\n"
);
if (output_type != OUTPUT_RAW) {
fprintf(fo, "/* File generated automatically by the QuickJS-ng compiler. */\n"
"\n"
);
}

if (output_type != OUTPUT_C) {
if (output_type == OUTPUT_C_MAIN) {
fprintf(fo, "#include \"quickjs-libc.h\"\n"
"\n"
);
} else {
} else if (output_type == OUTPUT_C) {
fprintf(fo, "#include <inttypes.h>\n"
"\n"
);
Expand All @@ -480,7 +491,7 @@ int main(int argc, char **argv)
}
}

if (output_type != OUTPUT_C) {
if (output_type == OUTPUT_C_MAIN) {
fprintf(fo,
"static JSContext *JS_NewCustomContext(JSRuntime *rt)\n"
"{\n"
Expand Down