Skip to content
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

Jump to bottom

wip: go unsafe #408

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

wip: go unsafe #408

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 2 additions & 1 deletion include/fsm/print.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@ fsm_print fsm_print_vmasm_amd64_att; /* output amd64 assembler in AT&T format *
fsm_print fsm_print_vmasm_amd64_nasm; /* output amd64 assembler in NASM format */
fsm_print fsm_print_vmasm_amd64_go; /* output amd64 assembler in Go format */
fsm_print fsm_print_sh;
fsm_print fsm_print_go;
fsm_print fsm_print_go_safe;
fsm_print fsm_print_go_unsafe;
fsm_print fsm_print_rust;

#endif
Expand Down
4 changes: 3 additions & 1 deletion src/fsm/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,9 @@ print_name(const char *name)
{ "vmdot", fsm_print_vmdot },
{ "rust", fsm_print_rust },
{ "sh", fsm_print_sh },
{ "go", fsm_print_go },

{ "go", fsm_print_go_safe },
{ "go_unsafe", fsm_print_go_unsafe },

{ "amd64", fsm_print_vmasm },
{ "amd64_att", fsm_print_vmasm_amd64_att },
Expand Down
3 changes: 2 additions & 1 deletion src/libfsm/libfsm.syms
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ fsm_print_vmasm_amd64_nasm
fsm_print_vmasm_amd64_go
fsm_print_rust
fsm_print_sh
fsm_print_go
fsm_print_go_safe
fsm_print_go_unsafe

# <fsm/fsm.h>
fsm_clone
Expand Down
110 changes: 92 additions & 18 deletions src/libfsm/print/go.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@

#include "ir.h"

enum go_dialect {
GO_SAFE,
GO_UNSAFE,
};

static int
leaf(FILE *f, const struct fsm_end_ids *ids, const void *leaf_opaque)
{
Expand Down Expand Up @@ -76,13 +81,18 @@ print_label(FILE *f, const struct dfavm_op_ir *op, const struct fsm_options *opt
}

static void
print_cond(FILE *f, const struct dfavm_op_ir *op, const struct fsm_options *opt)
print_cond(FILE *f, const struct dfavm_op_ir *op, const struct fsm_options *opt, enum go_dialect dialect)
{
if (op->cmp == VM_CMP_ALWAYS) {
return;
}

fprintf(f, "if data[idx] %s ", cmp_operator(op->cmp));
switch (dialect) {
case GO_SAFE: fprintf(f, "if data[idx] %s ", cmp_operator(op->cmp)); break;
case GO_UNSAFE: fprintf(f, "if c %s ", cmp_operator(op->cmp)); break;
break;
}

/* Go's character escapes are a superset of C's. */
c_escputcharlit(f, opt, op->cmp_arg);
fprintf(f, " ");
Expand Down Expand Up @@ -111,12 +121,35 @@ print_branch(FILE *f, const struct dfavm_op_ir *op)
}

static void
print_fetch(FILE *f, const struct fsm_options *opt)
print_fetch_end(FILE *f, const struct fsm_options *opt, enum go_dialect dialect)
{
switch (opt->io) {
case FSM_IO_STR:
case FSM_IO_PAIR:
switch (dialect) {
case GO_SAFE: fprintf(f, "if idx++; idx >= uint(len(data)) "); break;
case GO_UNSAFE: fprintf(f, "if ptr == end "); break;
}
break;
default:
assert(!"unreached");
}
}

static void
print_fetch(FILE *f, const struct fsm_options *opt, enum go_dialect dialect)
{
switch (opt->io) {
case FSM_IO_STR:
case FSM_IO_PAIR:
fprintf(f, "if idx++; idx >= uint(len(data)) ");
switch (dialect) {
case GO_SAFE:
/* Nothing */
break;
case GO_UNSAFE:
fprintf(f, "\tptr = (*byte)(unsafe.Add(unsafe.Pointer(ptr), 1))\n");
fprintf(f, "\tc = *ptr\n");
}
break;
default:
assert(!"unreached");
Expand All @@ -126,6 +159,7 @@ print_fetch(FILE *f, const struct fsm_options *opt)
/* TODO: eventually to be non-static */
static int
fsm_print_gofrag(FILE *f, const struct ir *ir, const struct fsm_options *opt,
enum go_dialect dialect,
const char *cp,
int (*leaf)(FILE *, const struct fsm_end_ids *ids, const void *leaf_opaque),
const void *leaf_opaque)
Expand Down Expand Up @@ -182,17 +216,18 @@ fsm_print_gofrag(FILE *f, const struct ir *ir, const struct fsm_options *opt,

switch (op->instr) {
case VM_OP_STOP:
print_cond(f, op, opt);
print_cond(f, op, opt, dialect);
print_end(f, op, opt, op->u.stop.end_bits, ir);
break;

case VM_OP_FETCH:
print_fetch(f, opt);
print_fetch_end(f, opt, dialect);
print_end(f, op, opt, op->u.fetch.end_bits, ir);
print_fetch(f, opt, dialect);
break;

case VM_OP_BRANCH:
print_cond(f, op, opt);
print_cond(f, op, opt, dialect);
print_branch(f, op);
break;

Expand All @@ -210,7 +245,7 @@ fsm_print_gofrag(FILE *f, const struct ir *ir, const struct fsm_options *opt,
}

static void
fsm_print_go_complete(FILE *f, const struct ir *ir, const struct fsm_options *opt)
fsm_print_go_complete(FILE *f, const struct ir *ir, const struct fsm_options *opt, enum go_dialect dialect)
{
/* TODO: currently unused, but must be non-NULL */
const char *cp = "";
Expand All @@ -219,12 +254,12 @@ fsm_print_go_complete(FILE *f, const struct ir *ir, const struct fsm_options *op
assert(ir != NULL);
assert(opt != NULL);

(void) fsm_print_gofrag(f, ir, opt, cp,
(void) fsm_print_gofrag(f, ir, opt, dialect, cp,
opt->leaf != NULL ? opt->leaf : leaf, opt->leaf_opaque);
}

void
fsm_print_go(FILE *f, const struct fsm *fsm)
fsm_print_go(FILE *f, const struct fsm *fsm, enum go_dialect dialect)
{
struct ir *ir;
const char *prefix;
Expand All @@ -248,7 +283,7 @@ fsm_print_go(FILE *f, const struct fsm *fsm)
}

if (fsm->opt->fragment) {
fsm_print_go_complete(f, ir, fsm->opt);
fsm_print_go_complete(f, ir, fsm->opt, dialect);
return;
}

Expand All @@ -260,25 +295,57 @@ fsm_print_go(FILE *f, const struct fsm *fsm)

fprintf(f, "package %sfsm\n", package_prefix);
fprintf(f, "\n");
if (dialect == GO_UNSAFE) {
fprintf(f, "import \"unsafe\"\n");
}

fprintf(f, "func %sMatch", prefix);

switch (fsm->opt->io) {
case FSM_IO_PAIR:
fprintf(f, "(data []byte) int {\n");
if (ir->n > 0) {
/* start idx at -1 unsigned so after first increment we're correct at index 0 */
fprintf(f, "\tvar idx = ^uint(0)\n");
fprintf(f, "\n");
switch (dialect) {
case GO_SAFE:
fprintf(f, "\tvar idx = ^uint(0)\n");
fprintf(f, "\n");
break;
case GO_UNSAFE:
fprintf(f, "\tvar ptr, end *byte\n");
fprintf(f, "\tif len(data) > 0 {\n");
fprintf(f, "\t\tptr = (*byte)(unsafe.Pointer(&data[0]))\n");
fprintf(f, "\t\tend = (*byte)(unsafe.Add(unsafe.Pointer(ptr), len(data)))\n");
fprintf(f, "\t}\n");
fprintf(f, "\tvar c byte\n");
fprintf(f, "\n");
break;
}
}
break;

case FSM_IO_STR:
fprintf(f, "(data string) int {\n");
if (ir->n > 0) {
/* start idx at -1 unsigned so after first increment we're correct at index 0 */
fprintf(f, "\tvar idx = ^uint(0)\n");
fprintf(f, "\n");
switch (dialect) {
case GO_SAFE:
/* start idx at -1 unsigned so after first increment we're correct at index 0 */
fprintf(f, "\tvar idx = ^uint(0)\n");
fprintf(f, "\n");
break;
case GO_UNSAFE:
fprintf(stderr, "unsupported Safety/IO API combination\n");
exit(EXIT_FAILURE);
/*
fprintf(f, "\tvar ptr, end *byte\n");
fprintf(f, "\tif len(data) > 0 {\n");
fprintf(f, "\t\tptr = (*byte)(unsafe.Pointer(&data[0]))\n");
fprintf(f, "\t\tend = (*byte)(unsafe.Add(unsafe.Pointer(ptr), len(data)))\n");
fprintf(f, "\t}\n");
fprintf(f, "\tvar c byte\n");
fprintf(f, "\n");
break;
*/
}
}
break;

Expand All @@ -287,10 +354,17 @@ fsm_print_go(FILE *f, const struct fsm *fsm)
exit(EXIT_FAILURE);
}

fsm_print_go_complete(f, ir, fsm->opt);
fsm_print_go_complete(f, ir, fsm->opt, dialect);

fprintf(f, "}\n");

free_ir(fsm, ir);
}

void fsm_print_go_safe(FILE *f, const struct fsm *fsm) {
fsm_print_go(f, fsm, GO_SAFE);
}

void fsm_print_go_unsafe(FILE *f, const struct fsm *fsm) {
fsm_print_go(f, fsm, GO_UNSAFE);
}
4 changes: 3 additions & 1 deletion src/re/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ print_name(const char *name,
{ "vmdot", fsm_print_vmdot, NULL },
{ "rust", fsm_print_rust, NULL },
{ "sh", fsm_print_sh, NULL },
{ "go", fsm_print_go, NULL },

{ "go", fsm_print_go_safe, NULL },
{ "go_unsafe", fsm_print_go_unsafe, NULL },

{ "amd64", fsm_print_vmasm, NULL },
{ "amd64_att", fsm_print_vmasm_amd64_att, NULL },
Expand Down