void Parser::parse_enter(void) {
size_t id = read_uint();
- Call::Signature *sig = lookup(functions, id);
+ FunctionSig *sig = lookup(functions, id);
if (!sig) {
- sig = new Call::Signature;
+ sig = new FunctionSig;
+ sig->id = id;
sig->name = read_string();
- unsigned size = read_uint();
- for (unsigned i = 0; i < size; ++i) {
- sig->arg_names.push_back(read_string());
+ sig->num_args = read_uint();
+ const char **arg_names = new const char *[sig->num_args];
+ for (unsigned i = 0; i < sig->num_args; ++i) {
+ arg_names[i] = read_string();
}
+ sig->arg_names = arg_names;
functions[id] = sig;
}
assert(sig);
size_t id = read_uint();
BitmaskSig *sig = lookup(bitmasks, id);
if (!sig) {
- size_t count = read_uint();
- BitmaskVal *values = new BitmaskVal[count];
- for (BitmaskVal *it = values; it != values + count; ++it) {
+ sig = new BitmaskSig;
+ sig->id = id;
+ sig->num_flags = read_uint();
+ BitmaskFlag *flags = new BitmaskFlag[sig->num_flags];
+ for (BitmaskFlag *it = flags; it != flags + sig->num_flags; ++it) {
it->name = read_string();
it->value = read_uint();
- if (it->value == 0 && it != values) {
+ if (it->value == 0 && it != flags) {
std::cerr << "warning: bitmask " << it->name << " is zero but is not first flag\n";
}
}
- sig = new BitmaskSig;
- sig->id = id;
- sig->count = count;
- sig->values = values;
+ sig->flags = flags;
bitmasks[id] = sig;
}
assert(sig);