Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEugene Tarassov2015-03-26 01:25:04 +0000
committerEugene Tarassov2015-03-26 03:00:19 +0000
commitb461531a9bba8e87785d511bddc500f2a5a916fc (patch)
tree99479d88c17be959c15513780451b9e24478e450 /agent/tcf/services/linenumbers_proxy.c
parent8e7c592ee89c838ed4b51b14dd224b47a981350c (diff)
downloadorg.eclipse.tcf.agent-b461531a9bba8e87785d511bddc500f2a5a916fc.tar.gz
org.eclipse.tcf.agent-b461531a9bba8e87785d511bddc500f2a5a916fc.tar.xz
org.eclipse.tcf.agent-b461531a9bba8e87785d511bddc500f2a5a916fc.zip
TCF Server: fixed symbols server support of stepping over inlined functions
Diffstat (limited to 'agent/tcf/services/linenumbers_proxy.c')
-rw-r--r--agent/tcf/services/linenumbers_proxy.c23
1 files changed, 1 insertions, 22 deletions
diff --git a/agent/tcf/services/linenumbers_proxy.c b/agent/tcf/services/linenumbers_proxy.c
index f3760670..c2115de4 100644
--- a/agent/tcf/services/linenumbers_proxy.c
+++ b/agent/tcf/services/linenumbers_proxy.c
@@ -155,26 +155,6 @@ static unsigned calc_hash(Context * ctx, const char * file, int line, int column
return (h + ((uintptr_t)ctx >> 4) + (unsigned)line + (unsigned)column) % HASH_SIZE;
}
-static void read_code_area_props(InputStream * inp, const char * name, void * args) {
- CodeArea * area = (CodeArea *)args;
- if (strcmp(name, "SLine") == 0) area->start_line = json_read_long(inp);
- else if (strcmp(name, "SCol") == 0) area->start_column = json_read_long(inp);
- else if (strcmp(name, "SAddr") == 0) area->start_address = (ContextAddress)json_read_uint64(inp);
- else if (strcmp(name, "ELine") == 0) area->end_line = json_read_long(inp);
- else if (strcmp(name, "ECol") == 0) area->end_column = json_read_long(inp);
- else if (strcmp(name, "EAddr") == 0) area->end_address = (ContextAddress)json_read_uint64(inp);
- else if (strcmp(name, "NAddr") == 0) area->next_address = (ContextAddress)json_read_uint64(inp);
- else if (strcmp(name, "File") == 0) area->file = json_read_alloc_string(inp);
- else if (strcmp(name, "Dir") == 0) area->directory = json_read_alloc_string(inp);
- else if (strcmp(name, "ISA") == 0) area->isa = json_read_long(inp);
- else if (strcmp(name, "IsStmt") == 0) area->is_statement = json_read_boolean(inp);
- else if (strcmp(name, "BasicBlock") == 0) area->basic_block = json_read_boolean(inp);
- else if (strcmp(name, "PrologueEnd") == 0) area->prologue_end = json_read_boolean(inp);
- else if (strcmp(name, "EpilogueBegin") == 0) area->epilogue_begin = json_read_boolean(inp);
- else if (strcmp(name, "OpIndex") == 0) area->op_index = json_read_long(inp);
- else if (strcmp(name, "Discriminator") == 0) area->discriminator = json_read_long(inp);
-}
-
static void read_code_area_array(InputStream * inp, void * args) {
CodeArea * area = NULL;
if (code_area_cnt >= code_area_max) {
@@ -182,8 +162,7 @@ static void read_code_area_array(InputStream * inp, void * args) {
code_area_buf = (CodeArea *)loc_realloc(code_area_buf, sizeof(CodeArea) * code_area_max);
}
area = code_area_buf + code_area_cnt++;
- memset(area, 0, sizeof(CodeArea));
- json_read_struct(inp, read_code_area_props, area);
+ read_code_area(inp, area);
}
static void validate_cache_entry(Channel * c, void * args, int error) {

Back to the top