Merge pull request #121 from haberman/minimize

Changed C API to only define structs, a table, and a few minimal inline function.

7 files changed, 73 insertions, 44 deletions

diff --git a/upb/bindings/lua/upb/pb.c b/upb/bindings/lua/upb/pb.c
index 466e8f7..bca2ee8 100644
--- a/upb/bindings/lua/upb/pb.c
+++ b/upb/bindings/lua/upb/pb.c
@@ -13,21 +13,13 @@
 
 static int lupb_pb_decode(lua_State *L) {
   size_t len;
-  upb_status status = UPB_STATUS_INIT;
   const upb_msglayout *layout;
   upb_msg *msg = lupb_msg_checkmsg2(L, 1, &layout);
   const char *pb = lua_tolstring(L, 2, &len);
   upb_stringview buf = upb_stringview_make(pb, len);
-  upb_env env;
 
-  upb_env_init(&env);
-  upb_env_reporterrorsto(&env, &status);
-
-  upb_decode(buf, msg, (const void*)layout, &env);
-
-  /* Free resources before we potentially bail on error. */
-  upb_env_uninit(&env);
-  lupb_checkstatus(L, &status);
+  upb_decode(buf, msg, layout);
+  /* TODO(haberman): check for error. */
 
   return 0;
 }
@@ -35,21 +27,19 @@ static int lupb_pb_decode(lua_State *L) {
 static int lupb_pb_encode(lua_State *L) {
   const upb_msglayout *layout;
   const upb_msg *msg = lupb_msg_checkmsg2(L, 1, &layout);
-  upb_env env;
+  upb_arena arena;
   size_t size;
-  upb_status status = UPB_STATUS_INIT;
   char *result;
 
-  upb_env_init(&env);
-  upb_env_reporterrorsto(&env, &status);
+  upb_arena_init(&arena);
 
-  result = upb_encode(msg, (const void*)layout, &env, &size);
+  result = upb_encode(msg, (const void*)layout, &arena, &size);
 
   /* Free resources before we potentially bail on error. */
-  upb_env_uninit(&env);
-  lupb_checkstatus(L, &status);
-
   lua_pushlstring(L, result, size);
+  upb_arena_uninit(&arena);
+  /* TODO(haberman): check for error. */
+
   return 1;
 }
 
diff --git a/upb/decode.c b/upb/decode.c
index 8a29709..b3de9b1 100644
--- a/upb/decode.c
+++ b/upb/decode.c
@@ -28,7 +28,6 @@ const uint8_t upb_desctype_to_fieldtype[] = {
 
 /* Data pertaining to the parse. */
 typedef struct {
-  upb_env *env;
   /* Current decoding pointer.  Points to the beginning of a field until we
    * have finished decoding the whole field. */
   const char *ptr;
@@ -201,19 +200,29 @@ static void *upb_array_add(upb_array *arr, size_t elements) {
   return ret;
 }
 
+static size_t get_field_offset(const upb_decframe *frame,
+                               const upb_msglayout_field *field) {
+  if (field->oneof_index == UPB_NOT_IN_ONEOF) {
+    return field->offset;
+  } else {
+    return frame->m->oneofs[field->oneof_index].data_offset;
+  }
+}
+
 static upb_array *upb_getarr(upb_decframe *frame,
                              const upb_msglayout_field *field) {
   UPB_ASSERT(field->label == UPB_LABEL_REPEATED);
+  UPB_ASSERT(field->oneof_index == UPB_NOT_IN_ONEOF);
   return *(upb_array**)&frame->msg[field->offset];
 }
 
-static upb_array *upb_getorcreatearr(upb_decstate *d, upb_decframe *frame,
+static upb_array *upb_getorcreatearr(upb_decframe *frame,
                                      const upb_msglayout_field *field) {
   upb_array *arr = upb_getarr(frame, field);
 
   if (!arr) {
     upb_fieldtype_t type = upb_desctype_to_fieldtype[field->descriptortype];
-    arr = upb_array_new(type, upb_env_arena(d->env));
+    arr = upb_array_new(type, upb_msg_arena(frame->msg));
     if (!arr) {
       return NULL;
     }
@@ -236,13 +245,13 @@ static void upb_setoneofcase(upb_decframe *frame,
             field->number);
 }
 
-static char *upb_decode_prepareslot(upb_decstate *d, upb_decframe *frame,
+static char *upb_decode_prepareslot(upb_decframe *frame,
                                     const upb_msglayout_field *field) {
-  char *field_mem = frame->msg + field->offset;
+  char *field_mem = frame->msg + get_field_offset(frame, field);
   upb_array *arr;
 
   if (field->label == UPB_LABEL_REPEATED) {
-    arr = upb_getorcreatearr(d, frame, field);
+    arr = upb_getorcreatearr(frame, field);
     field_mem = upb_array_reserve(arr, 1);
   }
 
@@ -266,7 +275,7 @@ static bool upb_decode_submsg(upb_decstate *d, upb_decframe *frame,
                               const char *limit,
                               const upb_msglayout_field *field,
                               int group_number) {
-  char *submsg_slot = upb_decode_prepareslot(d, frame, field);
+  char *submsg_slot = upb_decode_prepareslot(frame, field);
   char *submsg = *(void **)submsg_slot;
   const upb_msglayout *subm;
 
@@ -275,7 +284,7 @@ static bool upb_decode_submsg(upb_decstate *d, upb_decframe *frame,
   UPB_ASSERT(subm);
 
   if (!submsg) {
-    submsg = upb_msg_new((upb_msglayout *)subm, upb_env_arena(d->env));
+    submsg = upb_msg_new(subm, upb_msg_arena(frame->msg));
     CHK(submsg);
     *(void**)submsg_slot = submsg;
   }
@@ -291,7 +300,7 @@ static bool upb_decode_varintfield(upb_decstate *d, upb_decframe *frame,
   uint64_t val;
   void *field_mem;
 
-  field_mem = upb_decode_prepareslot(d, frame, field);
+  field_mem = upb_decode_prepareslot(frame, field);
   CHK(field_mem);
   CHK(upb_decode_varint(&d->ptr, frame->limit, &val));
 
@@ -336,7 +345,7 @@ static bool upb_decode_64bitfield(upb_decstate *d, upb_decframe *frame,
   void *field_mem;
   uint64_t val;
 
-  field_mem = upb_decode_prepareslot(d, frame, field);
+  field_mem = upb_decode_prepareslot(frame, field);
   CHK(field_mem);
   CHK(upb_decode_64bit(&d->ptr, frame->limit, &val));
 
@@ -360,7 +369,7 @@ static bool upb_decode_32bitfield(upb_decstate *d, upb_decframe *frame,
   void *field_mem;
   uint32_t val;
 
-  field_mem = upb_decode_prepareslot(d, frame, field);
+  field_mem = upb_decode_prepareslot(frame, field);
   CHK(field_mem);
   CHK(upb_decode_32bit(&d->ptr, frame->limit, &val));
 
@@ -394,7 +403,7 @@ static bool upb_decode_toarray(upb_decstate *d, upb_decframe *frame,
                                const char *field_start,
                                const upb_msglayout_field *field,
                                upb_stringview val) {
-  upb_array *arr = upb_getorcreatearr(d, frame, field);
+  upb_array *arr = upb_getorcreatearr(frame, field);
 
 #define VARINT_CASE(ctype, decode) { \
   const char *ptr = val.data; \
@@ -455,7 +464,7 @@ static bool upb_decode_toarray(upb_decstate *d, upb_decframe *frame,
       subm = frame->m->submsgs[field->submsg_index];
       UPB_ASSERT(subm);
 
-      submsg = upb_msg_new((upb_msglayout *)subm, upb_env_arena(d->env));
+      submsg = upb_msg_new(subm, upb_msg_arena(frame->msg));
       CHK(submsg);
 
       field_mem = upb_array_add(arr, 1);
@@ -485,7 +494,7 @@ static bool upb_decode_delimitedfield(upb_decstate *d, upb_decframe *frame,
     switch ((upb_descriptortype_t)field->descriptortype) {
       case UPB_DESCRIPTOR_TYPE_STRING:
       case UPB_DESCRIPTOR_TYPE_BYTES: {
-        void *field_mem = upb_decode_prepareslot(d, frame, field);
+        void *field_mem = upb_decode_prepareslot(frame, field);
         CHK(field_mem);
         memcpy(field_mem, &val, sizeof(val));
         break;
@@ -587,11 +596,9 @@ static bool upb_decode_message(upb_decstate *d, const char *limit,
   return true;
 }
 
-bool upb_decode(upb_stringview buf, void *msg, const upb_msglayout *l,
-                upb_env *env) {
+bool upb_decode(upb_stringview buf, void *msg, const upb_msglayout *l) {
   upb_decstate state;
   state.ptr = buf.data;
-  state.env = env;
 
   return upb_decode_message(&state, buf.data + buf.size, 0, msg, l);
 }
diff --git a/upb/decode.h b/upb/decode.h
index 963b399..79774ed 100644
--- a/upb/decode.h
+++ b/upb/decode.h
@@ -9,8 +9,7 @@
 
 UPB_BEGIN_EXTERN_C
 
-bool upb_decode(upb_stringview buf, void *msg, const upb_msglayout *l,
-                upb_env *env);
+bool upb_decode(upb_stringview buf, upb_msg *msg, const upb_msglayout *l);
 
 UPB_END_EXTERN_C
 
diff --git a/upb/encode.c b/upb/encode.c
index 24d72a8..034a90d 100644
--- a/upb/encode.c
+++ b/upb/encode.c
@@ -47,7 +47,7 @@ static uint32_t upb_zzencode_32(int32_t n) { return (n << 1) ^ (n >> 31); }
 static uint64_t upb_zzencode_64(int64_t n) { return (n << 1) ^ (n >> 63); }
 
 typedef struct {
-  upb_env *env;
+  upb_alloc *alloc;
   char *buf, *ptr, *limit;
 } upb_encstate;
 
@@ -62,7 +62,7 @@ static size_t upb_roundup_pow2(size_t bytes) {
 static bool upb_encode_growbuffer(upb_encstate *e, size_t bytes) {
   size_t old_size = e->limit - e->buf;
   size_t new_size = upb_roundup_pow2(bytes + (e->limit - e->ptr));
-  char *new_buf = upb_env_realloc(e->env, e->buf, old_size, new_size);
+  char *new_buf = upb_realloc(e->alloc, e->buf, old_size, new_size);
   CHK(new_buf);
 
   /* We want previous data at the end, realloc() put it at the beginning. */
@@ -340,6 +340,15 @@ bool upb_encode_hasscalarfield(const char *msg, const upb_msglayout *m,
   }
 }
 
+static size_t get_field_offset2(const upb_msglayout *m,
+                                const upb_msglayout_field *field) {
+  if (field->oneof_index == UPB_NOT_IN_ONEOF) {
+    return field->offset;
+  } else {
+    return m->oneofs[field->oneof_index].data_offset;
+  }
+}
+
 bool upb_encode_message(upb_encstate *e, const char *msg,
                         const upb_msglayout *m, size_t *size) {
   int i;
@@ -351,13 +360,14 @@ bool upb_encode_message(upb_encstate *e, const char *msg,
 
   for (i = m->field_count - 1; i >= 0; i--) {
     const upb_msglayout_field *f = &m->fields[i];
+    size_t offset = get_field_offset2(m, f);
 
     if (f->label == UPB_LABEL_REPEATED) {
-      CHK(upb_encode_array(e, msg + f->offset, m, f));
+      CHK(upb_encode_array(e, msg + offset, m, f));
     } else {
       if (upb_encode_hasscalarfield(msg, m, f)) {
         if (f->oneof_index == UPB_NOT_IN_ONEOF) {
-          CHK(upb_encode_scalarfield(e, msg + f->offset, m, f, !m->is_proto2));
+          CHK(upb_encode_scalarfield(e, msg + offset, m, f, !m->is_proto2));
         } else {
           const upb_msglayout_oneof *o = &m->oneofs[f->oneof_index];
           CHK(upb_encode_scalarfield(e, msg + o->data_offset,
@@ -371,10 +381,10 @@ bool upb_encode_message(upb_encstate *e, const char *msg,
   return true;
 }
 
-char *upb_encode(const void *msg, const upb_msglayout *m, upb_env *env,
+char *upb_encode(const void *msg, const upb_msglayout *m, upb_arena *arena,
                  size_t *size) {
   upb_encstate e;
-  e.env = env;
+  e.alloc = upb_arena_alloc(arena);
   e.buf = NULL;
   e.limit = NULL;
   e.ptr = NULL;
diff --git a/upb/encode.h b/upb/encode.h
index 8f42736..1a451b0 100644
--- a/upb/encode.h
+++ b/upb/encode.h
@@ -9,7 +9,7 @@
 
 UPB_BEGIN_EXTERN_C
 
-char *upb_encode(const void *msg, const upb_msglayout *l, upb_env *env,
+char *upb_encode(const void *msg, const upb_msglayout *l, upb_arena *arena,
                  size_t *size);
 
 UPB_END_EXTERN_C
diff --git a/upb/port_def.inc b/upb/port_def.inc
new file mode 100644
index 0000000..33ff78c
--- /dev/null
+++ b/upb/port_def.inc
@@ -0,0 +1,18 @@
+
+#if UINTPTR_MAX == 0xffffffff
+#define UPB_SIZE(size32, size64) size32
+#else
+#define UPB_SIZE(size32, size64) size64
+#endif
+
+#define UPB_FIELD_AT(msg, fieldtype, offset) \
+  *(fieldtype*)((const char*)(msg) + offset)
+
+#define UPB_READ_ONEOF(msg, fieldtype, offset, case_offset, case_val, default) \
+  UPB_FIELD_AT(msg, int, case_offset) == case_val                              \
+      ? UPB_FIELD_AT(msg, fieldtype, offset)                                   \
+      : default
+
+#define UPB_WRITE_ONEOF(msg, fieldtype, offset, value, case_offset, case_val) \
+  UPB_FIELD_AT(msg, int, case_offset) = case_val;                             \
+  UPB_FIELD_AT(msg, fieldtype, offset) = value;
diff --git a/upb/port_undef.inc b/upb/port_undef.inc
new file mode 100644
index 0000000..7db97ca
--- /dev/null
+++ b/upb/port_undef.inc
@@ -0,0 +1,5 @@
+
+#undef UPB_SIZE
+#undef UPB_FIELD_AT
+#undef UPB_READ_ONEOF
+#undef UPB_WRITE_ONEOF