Chiebot-Mirror
/
protobuf
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

More renaming.

Browse Source
pull/13171/head
Joshua Haberman 14 years ago
parent 1782f28c86
commit ea2a80840e
3 changed files with 25 additions and 26 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 20
      src/upb_decoder.c
  2. 28
      src/upb_decoder_x86.dasc
  3. 3
      src/upb_textprinter.c

20
src/upb_decoder.c
Unescape View File

@ -190,7 +190,7 @@ INLINE void upb_pop(upb_decoder *d) {
upb_decoder_setmsgend(d);
}
INLINE void upb_push(upb_decoder *d, upb_fieldent *f, uint32_t end) {
INLINE void upb_push(upb_decoder *d, upb_fhandlers *f, uint32_t end) {
upb_dispatch_startsubmsg(&d->dispatcher, f, end);
upb_decoder_setmsgend(d);
}
@ -203,7 +203,7 @@ INLINE void upb_push(upb_decoder *d, upb_fieldent *f, uint32_t end) {
// but proto2 does not do this, so we pass.
#define T(type, wt, valtype, convfunc) \
INLINE void upb_decode_ ## type(upb_decoder *d, upb_fieldent *f) { \
INLINE void upb_decode_ ## type(upb_decoder *d, upb_fhandlers *f) { \
upb_value val; \
upb_value_set ## valtype(&val, (convfunc)(upb_decode_ ## wt(d))); \
upb_dispatch_value(&d->dispatcher, f, val); \
@ -230,14 +230,14 @@ T(SINT32, varint, int32, upb_zzdec_32)
T(SINT64, varint, int64, upb_zzdec_64)
T(STRING, string, str, upb_string*)
static void upb_decode_GROUP(upb_decoder *d, upb_fieldent *f) {
static void upb_decode_GROUP(upb_decoder *d, upb_fhandlers *f) {
upb_push(d, f, UPB_GROUPEND);
}
static void upb_endgroup(upb_decoder *d, upb_fieldent *f) {
static void upb_endgroup(upb_decoder *d, upb_fhandlers *f) {
(void)f;
upb_pop(d);
}
static void upb_decode_MESSAGE(upb_decoder *d, upb_fieldent *f) {
static void upb_decode_MESSAGE(upb_decoder *d, upb_fhandlers *f) {
upb_push(d, f, upb_decode_varint32(d, true) + (d->ptr - d->buf));
}
@ -269,10 +269,10 @@ static void upb_decoder_enterjit(upb_decoder *d) {
#endif
}
INLINE upb_fieldent *upb_decode_tag(upb_decoder *d) {
INLINE upb_fhandlers *upb_decode_tag(upb_decoder *d) {
while (1) {
uint32_t tag = upb_decode_varint32(d, false);
upb_fieldent *f = upb_dispatcher_lookup(&d->dispatcher, tag);
upb_fhandlers *f = upb_dispatcher_lookup(&d->dispatcher, tag);
if (f) {
d->f = f;
return f;
@ -324,7 +324,7 @@ void upb_decoder_decode(upb_decoder *d, upb_status *status) {
while (d->ptr >= d->submsg_end) upb_delimend(d);
upb_decoder_enterjit(d);
// if (!d->dispatcher.top->is_packed)
upb_fieldent *f = upb_decode_tag(d);
upb_fhandlers *f = upb_decode_tag(d);
f->decode(d, f);
}
}
@ -341,10 +341,10 @@ void upb_decoder_init(upb_decoder *d, upb_handlers *handlers) {
// Set function pointers for each field's decode function.
for (int i = 0; i < handlers->msgs_len; i++) {
upb_msgent *m = &handlers->msgs[i];
upb_mhandlers *m = &handlers->msgs[i];
for(upb_inttable_iter i = upb_inttable_begin(&m->fieldtab); !upb_inttable_done(i);
i = upb_inttable_next(&m->fieldtab, i)) {
upb_fieldent *f = upb_inttable_iter_value(i);
upb_fhandlers *f = upb_inttable_iter_value(i);
switch (f->type) {
case UPB_TYPE(INT32): f->decode = &upb_decode_INT32; break;
case UPB_TYPE(INT64): f->decode = &upb_decode_INT64; break;

28
src/upb_decoder_x86.dasc
Unescape View File

@ -253,8 +253,8 @@ void upb_reg_jit_gdb(upb_decoder *d) {
// PTR should point to the beginning of the tag.
static void upb_decoder_jit_field(upb_decoder *d, uint32_t tag, uint32_t next_tag,
upb_msgent *m,
upb_fieldent *f, upb_fieldent *next_f) {
upb_mhandlers *m,
upb_fhandlers *f, upb_fhandlers *next_f) {
int tag_size = upb_value_size(tag);
// PC-label for the dispatch table.
@ -388,7 +388,7 @@ static void upb_decoder_jit_field(upb_decoder *d, uint32_t tag, uint32_t next_ta
| mov DECODER->dispatcher.top, rax
| mov FRAME, rax
upb_msgent *sub_m = upb_handlers_getmsgent(d->dispatcher.handlers, f);
upb_mhandlers *sub_m = upb_handlers_getmsgent(d->dispatcher.handlers, f);
if (sub_m->jit_parent_field_done_pclabel != UPB_MULTIPLE) {
| jmp =>sub_m->jit_startmsg_pclabel;
} else {
@ -437,7 +437,7 @@ static int upb_compare_uint32(const void *a, const void *b) {
return *(uint32_t*)a - *(uint32_t*)b;
}
static void upb_decoder_jit_msg(upb_decoder *d, upb_msgent *m) {
static void upb_decoder_jit_msg(upb_decoder *d, upb_mhandlers *m) {
|=>m->jit_startmsg_pclabel:
// Call startmsg handler (if any):
if (m->startmsg != upb_startmsg_nop) {
@ -467,11 +467,11 @@ static void upb_decoder_jit_msg(upb_decoder *d, upb_msgent *m) {
}
qsort(keys, num_keys, sizeof(uint32_t), &upb_compare_uint32);
upb_fieldent *last_f = NULL;
upb_fhandlers *last_f = NULL;
uint32_t last_tag = 0;
for(int i = 0; i < num_keys; i++) {
uint32_t key = keys[i];
upb_fieldent *f = upb_inttable_lookup(&m->fieldtab, key);
upb_fhandlers *f = upb_inttable_lookup(&m->fieldtab, key);
uint32_t tag = upb_vencode32(key);
if (last_f) upb_decoder_jit_field(d, last_tag, tag, m, last_f, f);
last_tag = tag;
@ -553,14 +553,14 @@ static void upb_decoder_jit(upb_decoder *d) {
| callp abort
}
void upb_decoder_jit_assignfieldlabs(upb_fieldent *f,
void upb_decoder_jit_assignfieldlabs(upb_fhandlers *f,
uint32_t *pclabel_count) {
f->jit_pclabel = (*pclabel_count)++;
f->jit_pclabel_notypecheck = (*pclabel_count)++;
f->jit_submsg_done_pclabel = (*pclabel_count)++;
}
void upb_decoder_jit_assignmsglabs(upb_msgent *m, uint32_t *pclabel_count) {
void upb_decoder_jit_assignmsglabs(upb_mhandlers *m, uint32_t *pclabel_count) {
m->jit_startmsg_pclabel = (*pclabel_count)++;
m->jit_endofbuf_pclabel = (*pclabel_count)++;
m->jit_endofmsg_pclabel = (*pclabel_count)++;
@ -572,7 +572,7 @@ void upb_decoder_jit_assignmsglabs(upb_msgent *m, uint32_t *pclabel_count) {
i = upb_inttable_next(&m->fieldtab, i)) {
uint32_t key = upb_inttable_iter_key(i);
m->max_field_number = UPB_MAX(m->max_field_number, key);
upb_fieldent *f = upb_inttable_iter_value(i);
upb_fhandlers *f = upb_inttable_iter_value(i);
upb_decoder_jit_assignfieldlabs(f, pclabel_count);
}
// XXX: Won't work for large field numbers; will need to use a upb_table.
@ -581,13 +581,13 @@ void upb_decoder_jit_assignmsglabs(upb_msgent *m, uint32_t *pclabel_count) {
// Second pass: for messages that have only one parent, link them to the field
// from which they are called.
void upb_decoder_jit_assignmsglabs2(upb_handlers *h, upb_msgent *m) {
void upb_decoder_jit_assignmsglabs2(upb_handlers *h, upb_mhandlers *m) {
upb_inttable_iter i;
for(i = upb_inttable_begin(&m->fieldtab); !upb_inttable_done(i);
i = upb_inttable_next(&m->fieldtab, i)) {
upb_fieldent *f = upb_inttable_iter_value(i);
upb_fhandlers *f = upb_inttable_iter_value(i);
if (upb_issubmsgtype(f->type)) {
upb_msgent *sub_m = upb_handlers_getmsgent(h, f);
upb_mhandlers *sub_m = upb_handlers_getmsgent(h, f);
if (sub_m->jit_parent_field_done_pclabel == UPB_NONE) {
sub_m->jit_parent_field_done_pclabel = f->jit_submsg_done_pclabel;
} else {
@ -631,9 +631,9 @@ void upb_decoder_makejit(upb_decoder *d) {
// Create dispatch tables.
for (int i = 0; i < h->msgs_len; i++) {
upb_msgent *m = &h->msgs[i];
upb_mhandlers *m = &h->msgs[i];
for (uint32_t j = 0; j <= m->max_field_number; j++) {
upb_fieldent *f = NULL;
upb_fhandlers *f = NULL;
for (int k = 0; k < 8; k++) {
f = upb_inttable_lookup(&m->fieldtab, (j << 3) | k);
if (f) break;

3
src/upb_textprinter.c
Unescape View File

@ -191,7 +191,6 @@ void upb_textprinter_reghandlers(upb_handlers *h) {
NULL, // endmsg
upb_textprinter_value,
upb_textprinter_startsubmsg,
upb_textprinter_endsubmsg,
NULL // Unknown
upb_textprinter_endsubmsg
);
}

Write Preview
Loading…
Cancel
Save