Implement vtables

This commit is contained in:
Nigel Tao committed 2020-01-09 22:21:49 +11:00
1 parent ea54c2ea11
commit ea47116edc
2 files changed
+96 -6

No files matched your search

+59 -3
View File
@@ -408,7 +408,7 @@ func insertInterfaceDefinitions(buf *buffer) error {
}
buf.writes(";\n")
}
buf.printf("} wuffs_base__%s__vtable;\n\n", n)
buf.printf("} wuffs_base__%s__func_ptrs;\n\n", n)
for _, f := range builtInInterfaceMethods[qid] {
returnsStatus := f.Effect().Coroutine() ||
@@ -426,8 +426,8 @@ func insertInterfaceDefinitions(buf *buffer) error {
buf.writes("int i;\n")
buf.printf("for (i = 0; i < %d; i++) {\n", a.MaxImplements)
buf.printf("if (v->vtable_name == wuffs_base__%s__vtable_name) {\n", n)
buf.printf("const wuffs_base__%s__vtable* func_ptrs = "+
"(const wuffs_base__%s__vtable*)(v->function_pointers);\n", n, n)
buf.printf("const wuffs_base__%s__func_ptrs* func_ptrs = "+
"(const wuffs_base__%s__func_ptrs*)(v->function_pointers);\n", n, n)
buf.printf("return (*func_ptrs->%s)(self", f.FuncName().Str(g.tm))
for _, o := range f.In().Fields() {
buf.writeb(',')
@@ -713,6 +713,13 @@ func (g *gen) genImpl(b *buffer) error {
return err
}
b.writes("// ---------------- VTables\n\n")
for _, n := range g.structList {
if err := g.writeVTableImpl(b, n); err != nil {
return err
}
}
b.writes("// ---------------- Initializer Implementations\n\n")
for _, n := range g.structList {
if err := g.writeInitializerImpl(b, n); err != nil {
@@ -911,6 +918,11 @@ func (g *gen) writeStructPrivateImpl(b *buffer, n *a.Struct) error {
if n.Classy() {
b.writes("uint32_t magic;\n")
b.writes("uint32_t active_coroutine;\n")
for _, impl := range n.Implements() {
qid := impl.AsTypeExpr().QID()
b.printf("wuffs_base__vtable vtable_for__wuffs_%s__%s;\n",
qid[0].Str(g.tm), qid[1].Str(g.tm))
}
b.writes("wuffs_base__vtable null_vtable;\n")
b.writes("\n")
}
@@ -1097,6 +1109,41 @@ var (
wiEnd = []byte("\n#endif // WUFFS_IMPLEMENTATION\n\n")
)
func (g *gen) writeVTableImpl(b *buffer, n *a.Struct) error {
impls := n.Implements()
if len(impls) == 0 {
return nil
}
if err := parseBuiltInInterfaceMethods(); err != nil {
return err
}
nQID := n.QID()
for _, impl := range impls {
iQID := impl.AsTypeExpr().QID()
b.printf("const wuffs_%s__%s__func_ptrs %s%s__func_ptrs_for__wuffs_%s__%s = {",
iQID[0].Str(g.tm), iQID[1].Str(g.tm),
g.pkgPrefix, nQID[1].Str(g.tm),
iQID[0].Str(g.tm), iQID[1].Str(g.tm),
)
// Note the two t.Map values: g.tm and builtInTokenMap.
altQID := t.QID{
builtInTokenMap.ByName(iQID[0].Str(g.tm)),
builtInTokenMap.ByName(iQID[1].Str(g.tm)),
}
for _, f := range builtInInterfaceMethods[altQID] {
b.printf("(void*)(&%s%s__%s),\n",
g.pkgPrefix, nQID[1].Str(g.tm),
f.FuncName().Str(&builtInTokenMap),
)
}
b.writes("};\n\n")
}
return nil
}
func (g *gen) writeInitializerSignature(b *buffer, n *a.Struct, public bool) error {
structName := n.QID().Str(g.tm)
b.printf("wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //\n"+
@@ -1199,6 +1246,15 @@ func (g *gen) writeInitializerImpl(b *buffer, n *a.Struct) error {
}
b.writes("self->private_impl.magic = WUFFS_BASE__MAGIC;\n")
for _, impl := range n.Implements() {
qid := impl.AsTypeExpr().QID()
iName := fmt.Sprintf("wuffs_%s__%s", qid[0].Str(g.tm), qid[1].Str(g.tm))
b.printf("self->private_impl.vtable_for__%s.vtable_name = "+
"%s__vtable_name;\n", iName, iName)
b.printf("self->private_impl.vtable_for__%s.function_pointers = "+
"(const void*)(&%s%s__func_ptrs_for__%s);\n",
iName, g.pkgPrefix, n.QID().Str(g.tm), iName)
}
b.writes("return wuffs_base__make_status(NULL);\n")
b.writes("}\n\n")
+37 -3
View File
@@ -2659,6 +2659,7 @@ struct wuffs_adler32__hasher__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__hasher_u32;
wuffs_base__vtable null_vtable;
uint32_t f_state;
@@ -2763,6 +2764,7 @@ struct wuffs_crc32__ieee_hasher__struct {
struct {
uint32_t magic;
uint32_t active_coroutine;
wuffs_base__vtable vtable_for__wuffs_base__hasher_u32;
wuffs_base__vtable null_vtable;
uint32_t f_state;
@@ -4599,7 +4601,7 @@ const char* wuffs_base__hasher_u32__vtable_name =
typedef struct {
uint32_t (*update_u32)(void* self, wuffs_base__slice_u8 a_x);
} wuffs_base__hasher_u32__vtable;
} wuffs_base__hasher_u32__func_ptrs;
WUFFS_BASE__MAYBE_STATIC uint32_t //
wuffs_base__hasher_u32__update_u32(wuffs_base__hasher_u32* self,
@@ -4615,8 +4617,8 @@ wuffs_base__hasher_u32__update_u32(wuffs_base__hasher_u32* self,
int i;
for (i = 0; i < 63; i++) {
if (v->vtable_name == wuffs_base__hasher_u32__vtable_name) {
const wuffs_base__hasher_u32__vtable* func_ptrs =
(const wuffs_base__hasher_u32__vtable*)(v->function_pointers);
const wuffs_base__hasher_u32__func_ptrs* func_ptrs =
(const wuffs_base__hasher_u32__func_ptrs*)(v->function_pointers);
return (*func_ptrs->update_u32)(self, a_x);
} else if (v->vtable_name == NULL) {
break;
@@ -4873,6 +4875,13 @@ wuffs_base__pixel_swizzler__swizzle_interleaved(
// ---------------- Private Function Prototypes
// ---------------- VTables
const wuffs_base__hasher_u32__func_ptrs
wuffs_adler32__hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
(void*)(&wuffs_adler32__hasher__update_u32),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -4916,6 +4925,10 @@ wuffs_adler32__hasher__initialize(wuffs_adler32__hasher* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__hasher_u32.vtable_name =
wuffs_base__hasher_u32__vtable_name;
self->private_impl.vtable_for__wuffs_base__hasher_u32.function_pointers =
(const void*)(&wuffs_adler32__hasher__func_ptrs_for__wuffs_base__hasher_u32);
return wuffs_base__make_status(NULL);
}
@@ -5884,6 +5897,13 @@ static const uint32_t //
// ---------------- Private Function Prototypes
// ---------------- VTables
const wuffs_base__hasher_u32__func_ptrs
wuffs_crc32__ieee_hasher__func_ptrs_for__wuffs_base__hasher_u32 = {
(void*)(&wuffs_crc32__ieee_hasher__update_u32),
};
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -5927,6 +5947,10 @@ wuffs_crc32__ieee_hasher__initialize(wuffs_crc32__ieee_hasher* self,
}
self->private_impl.magic = WUFFS_BASE__MAGIC;
self->private_impl.vtable_for__wuffs_base__hasher_u32.vtable_name =
wuffs_base__hasher_u32__vtable_name;
self->private_impl.vtable_for__wuffs_base__hasher_u32.function_pointers =
(const void*)(&wuffs_crc32__ieee_hasher__func_ptrs_for__wuffs_base__hasher_u32);
return wuffs_base__make_status(NULL);
}
@@ -6174,6 +6198,8 @@ wuffs_deflate__decoder__decode_huffman_slow(wuffs_deflate__decoder* self,
wuffs_base__io_buffer* a_dst,
wuffs_base__io_buffer* a_src);
// ---------------- VTables
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -7991,6 +8017,8 @@ static wuffs_base__status //
wuffs_lzw__decoder__write_to(wuffs_lzw__decoder* self,
wuffs_base__io_buffer* a_dst);
// ---------------- VTables
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -8591,6 +8619,8 @@ wuffs_gif__decoder__copy_to_image_buffer(wuffs_gif__decoder* self,
wuffs_base__pixel_buffer* a_pb,
wuffs_base__slice_u8 a_src);
// ---------------- VTables
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -11192,6 +11222,8 @@ const char* wuffs_gzip__error__bad_header = "#gzip: bad header";
// ---------------- Private Function Prototypes
// ---------------- VTables
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //
@@ -11682,6 +11714,8 @@ const char* wuffs_zlib__error__incorrect_dictionary =
// ---------------- Private Function Prototypes
// ---------------- VTables
// ---------------- Initializer Implementations
wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT //