Skip to main content
summaryrefslogtreecommitdiffstats
path: root/server
diff options
context:
space:
mode:
authorBenoit Perrin2016-04-01 06:40:43 -0400
committerEugene Tarassov2016-04-04 14:04:36 -0400
commitf52cfca061873a488cfdd3b873aabc6f3b6b40cf (patch)
tree8db1c829f34c03f10ba1ad940d23a7e82338f88d /server
parent69ce4e095f317e124601c657c8d6cd78712c7f1b (diff)
downloadorg.eclipse.tcf.agent-f52cfca061873a488cfdd3b873aabc6f3b6b40cf.tar.gz
org.eclipse.tcf.agent-f52cfca061873a488cfdd3b873aabc6f3b6b40cf.tar.xz
org.eclipse.tcf.agent-f52cfca061873a488cfdd3b873aabc6f3b6b40cf.zip
Bug 490893 - Support expressions evaluation APIs without Expressions service
Update Expressions service code to enable the expressions evaluation APIs without enabling the Expressions service. Also, add the ability to include the Expressions service in a value add if required with limited functionality, for now, compared to the case it is located in the agent: unable to write expression value to registers ... Signed-off-by: Benoit Perrin <benoit.perrin@windriver.com>
Diffstat (limited to 'server')
-rw-r--r--server/tcf/config.h6
-rw-r--r--server/tcf/main/server.c6
2 files changed, 11 insertions, 1 deletions
diff --git a/server/tcf/config.h b/server/tcf/config.h
index 8f31d92a..f4815849 100644
--- a/server/tcf/config.h
+++ b/server/tcf/config.h
@@ -1,5 +1,5 @@
/*******************************************************************************
- * Copyright (c) 2007, 2014 Wind River Systems, Inc. and others.
+ * Copyright (c) 2007, 2016 Wind River Systems, Inc. and others.
* All rights reserved. This program and the accompanying materials
* are made available under the terms of the Eclipse Public License v1.0
* and Eclipse Distribution License v1.0 which accompany this distribution.
@@ -86,6 +86,10 @@
# define ENABLE_LineNumbers (ENABLE_LineNumbersProxy || SERVICE_LineNumbers)
#endif
+#if !defined(ENABLE_Expressions)
+# define ENABLE_Expressions (SERVICE_Expressions)
+#endif
+
#if !defined(ENABLE_MemoryMap)
# define ENABLE_MemoryMap ((ENABLE_DebugContext && ENABLE_ContextProxy) || SERVICE_MemoryMap)
#endif
diff --git a/server/tcf/main/server.c b/server/tcf/main/server.c
index 0c723a50..881d44e4 100644
--- a/server/tcf/main/server.c
+++ b/server/tcf/main/server.c
@@ -23,6 +23,9 @@
#include <tcf/framework/json.h>
#include <tcf/framework/myalloc.h>
#include <tcf/framework/proxy.h>
+#if SERVICE_Expressions
+#include <tcf/services/expressions.h>
+#endif
#include <tcf/services/linenumbers.h>
#include <tcf/services/symbols.h>
#include <tcf/services/pathmap.h>
@@ -125,6 +128,9 @@ static void channel_redirection_listener(Channel * host, Channel * target) {
#if SERVICE_Disassembly
if (!service_da) ini_disassembly_service(host->protocol);
#endif
+#if SERVICE_Expressions
+ ini_expressions_service(host->protocol);
+#endif
#if ENABLE_DebugContext && ENABLE_ContextProxy
create_context_proxy(host, target, forward_pm);
#endif

Back to the top