.. | .. |
---|
7 | 7 | char *endptr, *tok, *name; |
---|
8 | 8 | struct map *map = ms->map; |
---|
9 | 9 | struct addr_map_symbol target = { |
---|
10 | | - .map = map, |
---|
| 10 | + .ms = { .map = map, }, |
---|
11 | 11 | }; |
---|
12 | 12 | |
---|
13 | 13 | tok = strchr(ops->raw, ','); |
---|
.. | .. |
---|
38 | 38 | return -1; |
---|
39 | 39 | target.addr = map__objdump_2mem(map, ops->target.addr); |
---|
40 | 40 | |
---|
41 | | - if (map_groups__find_ams(&target) == 0 && |
---|
42 | | - map__rip_2objdump(target.map, map->map_ip(target.map, target.addr)) == ops->target.addr) |
---|
43 | | - ops->target.sym = target.sym; |
---|
| 41 | + if (maps__find_ams(ms->maps, &target) == 0 && |
---|
| 42 | + map__rip_2objdump(target.ms.map, map->map_ip(target.ms.map, target.addr)) == ops->target.addr) |
---|
| 43 | + ops->target.sym = target.ms.sym; |
---|
44 | 44 | |
---|
45 | 45 | return 0; |
---|
46 | 46 | } |
---|
47 | 47 | |
---|
48 | 48 | static int call__scnprintf(struct ins *ins, char *bf, size_t size, |
---|
49 | | - struct ins_operands *ops); |
---|
| 49 | + struct ins_operands *ops, int max_ins_name); |
---|
50 | 50 | |
---|
51 | 51 | static struct ins_ops s390_call_ops = { |
---|
52 | 52 | .parse = s390_call__parse, |
---|
.. | .. |
---|
100 | 100 | return -1; |
---|
101 | 101 | } |
---|
102 | 102 | |
---|
103 | | -static int mov__scnprintf(struct ins *ins, char *bf, size_t size, |
---|
104 | | - struct ins_operands *ops); |
---|
105 | 103 | |
---|
106 | 104 | static struct ins_ops s390_mov_ops = { |
---|
107 | 105 | .parse = s390_mov__parse, |
---|
.. | .. |
---|
166 | 164 | if (!arch->initialized) { |
---|
167 | 165 | arch->initialized = true; |
---|
168 | 166 | arch->associate_instruction_ops = s390__associate_ins_ops; |
---|
169 | | - if (cpuid) |
---|
170 | | - err = s390__cpuid_parse(arch, cpuid); |
---|
| 167 | + if (cpuid) { |
---|
| 168 | + if (s390__cpuid_parse(arch, cpuid)) |
---|
| 169 | + err = SYMBOL_ANNOTATE_ERRNO__ARCH_INIT_CPUID_PARSING; |
---|
| 170 | + } |
---|
171 | 171 | } |
---|
172 | 172 | |
---|
173 | 173 | return err; |
---|