diff options
author | Eugene Tarassov | 2011-11-24 21:29:24 +0000 |
---|---|---|
committer | Eugene Tarassov | 2011-11-24 21:29:24 +0000 |
commit | f3647b55e7958eb89dece294d99ac8389c9cb57b (patch) | |
tree | 817b9703820880e224e27c4c85e30ecfa352cd17 | |
parent | dafe1eefa355d67b2f9de21b90914077c1194ef0 (diff) | |
download | org.eclipse.tcf.agent-f3647b55e7958eb89dece294d99ac8389c9cb57b.tar.gz org.eclipse.tcf.agent-f3647b55e7958eb89dece294d99ac8389c9cb57b.tar.xz org.eclipse.tcf.agent-f3647b55e7958eb89dece294d99ac8389c9cb57b.zip |
TCF Agent: added "tcf/" prefix to system and machine dependent header files.
-rw-r--r-- | .gitignore | 7 | ||||
-rw-r--r-- | agent/Makefile.inc | 16 | ||||
-rw-r--r-- | agent/agent.vcproj | 58 | ||||
-rw-r--r-- | agent/machine/i386/tcf/cpudefs-mdep.h | 1 | ||||
-rw-r--r-- | agent/machine/i386/tcf/dwarfreloc-mdep.h (renamed from agent/tcf/machine/i386/elf-mdep.h) | 0 | ||||
-rw-r--r-- | agent/machine/i686/tcf/cpudefs-mdep.h | 1 | ||||
-rw-r--r-- | agent/machine/x86_64/tcf/cpudefs-mdep.h (renamed from agent/tcf/machine/x86_64/cpudefs-mdep.h) | 2 | ||||
-rw-r--r-- | agent/system/Cygwin/tcf/regset.h (renamed from agent/tcf/system/Cygwin/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/Darwin/tcf/context-darwin.c (renamed from agent/tcf/system/Darwin/context-darwin.c) | 4 | ||||
-rw-r--r-- | agent/system/Darwin/tcf/regset.h (renamed from agent/tcf/system/Darwin/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/FreeBSD/tcf/context-freebsd.c (renamed from agent/tcf/system/FreeBSD/context-freebsd.c) | 4 | ||||
-rw-r--r-- | agent/system/FreeBSD/tcf/regset.h (renamed from agent/tcf/system/FreeBSD/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/GNU/Linux/tcf/context-linux.c (renamed from agent/tcf/system/GNU/Linux/context-linux.c) | 4 | ||||
-rw-r--r-- | agent/system/GNU/Linux/tcf/regset.h (renamed from agent/tcf/system/GNU/Linux/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/MinGW/tcf/regset.h (renamed from agent/tcf/system/MinGW/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/Msys/tcf/regset.h (renamed from agent/tcf/system/Msys/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/VxWorks/tcf/context-vxworks.c (renamed from agent/tcf/system/VxWorks/context-vxworks.c) | 4 | ||||
-rw-r--r-- | agent/system/VxWorks/tcf/context-vxworks.h (renamed from agent/tcf/system/VxWorks/context-vxworks.h) | 0 | ||||
-rw-r--r-- | agent/system/VxWorks/tcf/regset.h (renamed from agent/tcf/system/VxWorks/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/Windows/tcf/context-win32.c (renamed from agent/tcf/system/Windows/context-win32.c) | 8 | ||||
-rw-r--r-- | agent/system/Windows/tcf/context-win32.h (renamed from agent/tcf/system/Windows/context-win32.h) | 0 | ||||
-rw-r--r-- | agent/system/Windows/tcf/pthreads-win32.c (renamed from agent/tcf/system/Windows/pthreads-win32.c) | 2 | ||||
-rw-r--r-- | agent/system/Windows/tcf/pthreads-win32.h (renamed from agent/tcf/system/Windows/pthreads-win32.h) | 0 | ||||
-rw-r--r-- | agent/system/Windows/tcf/regset.h (renamed from agent/tcf/system/Windows/regset.h) | 0 | ||||
-rw-r--r-- | agent/system/Windows/tcf/windbgcache.c (renamed from agent/tcf/system/Windows/windbgcache.c) | 4 | ||||
-rw-r--r-- | agent/system/Windows/tcf/windbgcache.h (renamed from agent/tcf/system/Windows/windbgcache.h) | 0 | ||||
-rw-r--r-- | agent/tcf/framework/cpudefs-ext.h (renamed from agent/tcf/machine/cpudefs-ext.h) | 2 | ||||
-rw-r--r-- | agent/tcf/framework/cpudefs.c | 3 | ||||
-rw-r--r-- | agent/tcf/framework/mdep-threads.h | 2 | ||||
-rw-r--r-- | agent/tcf/framework/pid-hash.h (renamed from agent/tcf/system/pid-hash.h) | 0 | ||||
-rw-r--r-- | agent/tcf/machine/i386/cpudefs-mdep.h | 1 | ||||
-rw-r--r-- | agent/tcf/machine/i686/cpudefs-mdep.h | 1 | ||||
-rw-r--r-- | agent/tcf/main/test.c | 2 | ||||
-rw-r--r-- | agent/tcf/services/dwarfreloc-ext.h (renamed from agent/tcf/machine/elf-mdep.h) | 2 | ||||
-rw-r--r-- | agent/tcf/services/dwarfreloc.c | 2 | ||||
-rw-r--r-- | agent/tcf/services/linenumbers_win32.c | 4 | ||||
-rw-r--r-- | agent/tcf/services/symbols_win32.c | 4 | ||||
-rw-r--r-- | server/server.vcproj | 22 | ||||
-rw-r--r-- | server/tcf/framework/cpudefs-ext.h (renamed from server/tcf/machine/cpudefs-ext.h) | 0 | ||||
-rw-r--r-- | tests/test-dwarf/tcf/backend/backend.c | 2 | ||||
-rw-r--r-- | tests/test-dwarf/tcf/framework/cpudefs-ext.h (renamed from tests/test-dwarf/tcf/machine/cpudefs-ext.h) | 0 |
41 files changed, 83 insertions, 79 deletions
@@ -45,3 +45,10 @@ tests/test-dwarf/*.plt tests/test-dwarf/*.suo
tests/test-dwarf/*.user
+# tests/cmd-line/
+tests/cmd-line/obj
+tests/cmd-line/*.ncb
+tests/cmd-line/*.opt
+tests/cmd-line/*.plt
+tests/cmd-line/*.suo
+tests/cmd-line/*.user
diff --git a/agent/Makefile.inc b/agent/Makefile.inc index 9883926c..f568a1a8 100644 --- a/agent/Makefile.inc +++ b/agent/Makefile.inc @@ -7,8 +7,8 @@ ifndef MACHINE MACHINE := $(shell uname -m) endif -INCDIRS = . tcf/system/$(OPSYS) tcf/machine/$(MACHINE) -SRCDIRS = $(INCDIRS) tcf/system tcf/framework tcf/services tcf/main +INCDIRS = . system/$(OPSYS) machine/$(MACHINE) +SRCDIRS = . system/$(OPSYS)/tcf machine/$(MACHINE)/tcf tcf/framework tcf/services tcf/main BINDIR = obj/$(OPSYS)/$(MACHINE)/$(CONF) MKDIR = mkdir -p $(1) @@ -132,18 +132,18 @@ OFILES = $(addprefix $(BINDIR)/,$(addsuffix $(EXTOBJ),$(basename $(filter-out ma EXECS = $(addprefix $(BINDIR)/,agent$(EXTEXE) client$(EXTEXE) tcfreg$(EXTEXE) valueadd$(EXTEXE) tcflog$(EXTEXE)) ifeq ($(OPSYS),Cygwin) - CFILES += tcf/system/Windows/pthreads-win32.c - CFILES += tcf/system/Windows/context-win32.c + CFILES += system/Windows/tcf/pthreads-win32.c + CFILES += system/Windows/tcf/context-win32.c endif ifeq ($(OPSYS),Msys) - CFILES += tcf/system/Windows/pthreads-win32.c - CFILES += tcf/system/Windows/context-win32.c + CFILES += system/Windows/tcf/pthreads-win32.c + CFILES += system/Windows/tcf/context-win32.c endif ifeq ($(OPSYS),MinGW) - CFILES += tcf/system/Windows/pthreads-win32.c - CFILES += tcf/system/Windows/context-win32.c + CFILES += system/Windows/tcf/pthreads-win32.c + CFILES += system/Windows/tcf/context-win32.c endif ifdef SERVICES diff --git a/agent/agent.vcproj b/agent/agent.vcproj index e94f705a..c26fb507 100644 --- a/agent/agent.vcproj +++ b/agent/agent.vcproj @@ -45,7 +45,7 @@ AdditionalOptions="/Oy-"
Optimization="2"
InlineFunctionExpansion="1"
- AdditionalIncludeDirectories=".;tcf/system/Windows;tcf/machine/x86_64"
+ AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"
PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
StringPooling="true"
RuntimeLibrary="0"
@@ -134,7 +134,7 @@ <Tool
Name="VCCLCompilerTool"
Optimization="0"
- AdditionalIncludeDirectories=".;tcf/system/Windows;tcf/machine/x86_64"
+ AdditionalIncludeDirectories=".;system/Windows;machine/x86_64"
PreprocessorDefinitions="WIN32;_DEBUG;_CONSOLE"
MinimalRebuild="true"
RuntimeLibrary="1"
@@ -260,6 +260,10 @@ >
</File>
<File
+ RelativePath=".\tcf\framework\cpudefs-ext.h"
+ >
+ </File>
+ <File
RelativePath=".\tcf\framework\cpudefs.c"
>
</File>
@@ -360,6 +364,10 @@ >
</File>
<File
+ RelativePath=".\tcf\framework\pid-hash.h"
+ >
+ </File>
+ <File
RelativePath=".\tcf\framework\plugins.c"
>
</File>
@@ -799,39 +807,35 @@ <Filter
Name="system"
>
- <File
- RelativePath=".\tcf\system\pid-hash.h"
- >
- </File>
<Filter
Name="Windows"
>
<File
- RelativePath=".\tcf\system\Windows\context-win32.c"
+ RelativePath=".\system\Windows\tcf\context-win32.c"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\context-win32.h"
+ RelativePath=".\system\Windows\tcf\context-win32.h"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\pthreads-win32.c"
+ RelativePath=".\system\Windows\tcf\pthreads-win32.c"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\pthreads-win32.h"
+ RelativePath=".\system\Windows\tcf\pthreads-win32.h"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\regset.h"
+ RelativePath=".\system\Windows\tcf\regset.h"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\windbgcache.c"
+ RelativePath=".\system\Windows\tcf\windbgcache.c"
>
</File>
<File
- RelativePath=".\tcf\system\Windows\windbgcache.h"
+ RelativePath=".\system\Windows\tcf\windbgcache.h"
>
</File>
</Filter>
@@ -842,7 +846,7 @@ Name="Linux"
>
<File
- RelativePath=".\tcf\system\GNU\Linux\context-linux.c"
+ RelativePath=".\system\GNU\Linux\tcf\context-linux.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -862,7 +866,7 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tcf\system\GNU\Linux\regset.h"
+ RelativePath=".\system\GNU\Linux\tcf\regset.h"
>
</File>
</Filter>
@@ -871,7 +875,7 @@ Name="Darwin"
>
<File
- RelativePath=".\tcf\system\Darwin\context-darwin.c"
+ RelativePath=".\system\Darwin\tcf\context-darwin.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -891,7 +895,7 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tcf\system\Darwin\regset.h"
+ RelativePath=".\system\Darwin\tcf\regset.h"
>
</File>
</Filter>
@@ -899,7 +903,7 @@ Name="FreeBSD"
>
<File
- RelativePath=".\tcf\system\FreeBSD\context-freebsd.c"
+ RelativePath=".\system\FreeBSD\tcf\context-freebsd.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -919,7 +923,7 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tcf\system\FreeBSD\regset.h"
+ RelativePath=".\system\FreeBSD\tcf\regset.h"
>
</File>
</Filter>
@@ -927,7 +931,7 @@ Name="VxWorks"
>
<File
- RelativePath=".\tcf\system\VxWorks\context-vxworks.c"
+ RelativePath=".\system\VxWorks\tcf\context-vxworks.c"
>
<FileConfiguration
Name="Release|Win32"
@@ -947,11 +951,11 @@ </FileConfiguration>
</File>
<File
- RelativePath=".\tcf\system\VxWorks\context-vxworks.h"
+ RelativePath=".\system\VxWorks\tcf\context-vxworks.h"
>
</File>
<File
- RelativePath=".\tcf\system\VxWorks\regset.h"
+ RelativePath=".\system\VxWorks\tcf\regset.h"
>
</File>
</Filter>
@@ -959,7 +963,7 @@ Name="Cygwin"
>
<File
- RelativePath=".\tcf\system\Cygwin\regset.h"
+ RelativePath=".\system\Cygwin\tcf\regset.h"
>
</File>
</Filter>
@@ -967,7 +971,7 @@ Name="Msys"
>
<File
- RelativePath=".\tcf\system\Msys\regset.h"
+ RelativePath=".\system\Msys\tcf\regset.h"
>
</File>
</Filter>
@@ -975,15 +979,11 @@ <Filter
Name="machine"
>
- <File
- RelativePath=".\tcf\machine\cpudefs-ext.h"
- >
- </File>
<Filter
Name="x86_64"
>
<File
- RelativePath=".\tcf\machine\x86_64\cpudefs-mdep.h"
+ RelativePath=".\machine\x86_64\tcf\cpudefs-mdep.h"
>
</File>
</Filter>
diff --git a/agent/machine/i386/tcf/cpudefs-mdep.h b/agent/machine/i386/tcf/cpudefs-mdep.h new file mode 100644 index 00000000..3429d460 --- /dev/null +++ b/agent/machine/i386/tcf/cpudefs-mdep.h @@ -0,0 +1 @@ +#include "machine/x86_64/tcf/cpudefs-mdep.h" diff --git a/agent/tcf/machine/i386/elf-mdep.h b/agent/machine/i386/tcf/dwarfreloc-mdep.h index 3ab791c7..3ab791c7 100644 --- a/agent/tcf/machine/i386/elf-mdep.h +++ b/agent/machine/i386/tcf/dwarfreloc-mdep.h diff --git a/agent/machine/i686/tcf/cpudefs-mdep.h b/agent/machine/i686/tcf/cpudefs-mdep.h new file mode 100644 index 00000000..3429d460 --- /dev/null +++ b/agent/machine/i686/tcf/cpudefs-mdep.h @@ -0,0 +1 @@ +#include "machine/x86_64/tcf/cpudefs-mdep.h" diff --git a/agent/tcf/machine/x86_64/cpudefs-mdep.h b/agent/machine/x86_64/tcf/cpudefs-mdep.h index caee888b..0a1ab088 100644 --- a/agent/tcf/machine/x86_64/cpudefs-mdep.h +++ b/agent/machine/x86_64/tcf/cpudefs-mdep.h @@ -28,7 +28,7 @@ #if defined(__i386__) || defined(__x86_64__) -#include <regset.h> +#include <tcf/regset.h> #define REG_OFFSET(name) offsetof(REG_SET, name) diff --git a/agent/tcf/system/Cygwin/regset.h b/agent/system/Cygwin/tcf/regset.h index 08e2895d..08e2895d 100644 --- a/agent/tcf/system/Cygwin/regset.h +++ b/agent/system/Cygwin/tcf/regset.h diff --git a/agent/tcf/system/Darwin/context-darwin.c b/agent/system/Darwin/tcf/context-darwin.c index 50464b77..0f5c2620 100644 --- a/agent/tcf/system/Darwin/context-darwin.c +++ b/agent/system/Darwin/tcf/context-darwin.c @@ -39,7 +39,7 @@ #include <tcf/framework/waitpid.h> #include <tcf/framework/signames.h> #include <tcf/services/breakpoints.h> -#include <tcf/system/Darwin/regset.h> +#include <system/Darwin/tcf/regset.h> #define WORD_SIZE 4 @@ -65,7 +65,7 @@ static size_t context_extension_offset = 0; #define EXT(ctx) ((ContextExtensionDarwin *)((char *)(ctx) + context_extension_offset)) -#include <tcf/system/pid-hash.h> +#include <tcf/framework/pid-hash.h> static LINK pending_list = TCF_LIST_INIT(pending_list); diff --git a/agent/tcf/system/Darwin/regset.h b/agent/system/Darwin/tcf/regset.h index 0422799e..0422799e 100644 --- a/agent/tcf/system/Darwin/regset.h +++ b/agent/system/Darwin/tcf/regset.h diff --git a/agent/tcf/system/FreeBSD/context-freebsd.c b/agent/system/FreeBSD/tcf/context-freebsd.c index 9f01aaa0..b5f4226d 100644 --- a/agent/tcf/system/FreeBSD/context-freebsd.c +++ b/agent/system/FreeBSD/tcf/context-freebsd.c @@ -37,7 +37,7 @@ #include <tcf/framework/waitpid.h> #include <tcf/framework/signames.h> #include <tcf/services/breakpoints.h> -#include <tcf/system/FreeBSD/regset.h> +#include <system/FreeBSD/tcf/regset.h> #define PTRACE_TRACEME PT_TRACE_ME #define PTRACE_ATTACH PT_ATTACH @@ -72,7 +72,7 @@ static size_t context_extension_offset = 0; #define EXT(ctx) ((ContextExtensionBSD *)((char *)(ctx) + context_extension_offset)) -#include <tcf/system/pid-hash.h> +#include <tcf/framework/pid-hash.h> static LINK pending_list = TCF_LIST_INIT(pending_list); diff --git a/agent/tcf/system/FreeBSD/regset.h b/agent/system/FreeBSD/tcf/regset.h index add029bd..add029bd 100644 --- a/agent/tcf/system/FreeBSD/regset.h +++ b/agent/system/FreeBSD/tcf/regset.h diff --git a/agent/tcf/system/GNU/Linux/context-linux.c b/agent/system/GNU/Linux/tcf/context-linux.c index b8b5b198..41dcd183 100644 --- a/agent/tcf/system/GNU/Linux/context-linux.c +++ b/agent/system/GNU/Linux/tcf/context-linux.c @@ -44,7 +44,7 @@ #include <tcf/services/memorymap.h> #include <tcf/services/runctrl.h> #include <tcf/services/tcf_elf.h> -#include <tcf/system/GNU/Linux/regset.h> +#include <system/GNU/Linux/tcf/regset.h> #if !defined(PTRACE_SETOPTIONS) #define PTRACE_SETOPTIONS 0x4200 @@ -105,7 +105,7 @@ static size_t context_extension_offset = 0; #define EXT(ctx) ((ContextExtensionLinux *)((char *)(ctx) + context_extension_offset)) -#include <tcf/system/pid-hash.h> +#include <tcf/framework/pid-hash.h> static LINK pending_list = TCF_LIST_INIT(pending_list); static LINK detach_list = TCF_LIST_INIT(detach_list); diff --git a/agent/tcf/system/GNU/Linux/regset.h b/agent/system/GNU/Linux/tcf/regset.h index 9c6474e3..9c6474e3 100644 --- a/agent/tcf/system/GNU/Linux/regset.h +++ b/agent/system/GNU/Linux/tcf/regset.h diff --git a/agent/tcf/system/MinGW/regset.h b/agent/system/MinGW/tcf/regset.h index fb4eab83..fb4eab83 100644 --- a/agent/tcf/system/MinGW/regset.h +++ b/agent/system/MinGW/tcf/regset.h diff --git a/agent/tcf/system/Msys/regset.h b/agent/system/Msys/tcf/regset.h index fb4eab83..fb4eab83 100644 --- a/agent/tcf/system/Msys/regset.h +++ b/agent/system/Msys/tcf/regset.h diff --git a/agent/tcf/system/VxWorks/context-vxworks.c b/agent/system/VxWorks/tcf/context-vxworks.c index 18fb927d..42283e24 100644 --- a/agent/tcf/system/VxWorks/context-vxworks.c +++ b/agent/system/VxWorks/tcf/context-vxworks.c @@ -36,7 +36,7 @@ #include <tcf/framework/signames.h> #include <tcf/services/breakpoints.h> #include <tcf/services/memorymap.h> -#include <tcf/system/VxWorks/context-vxworks.h> +#include <system/VxWorks/tcf/context-vxworks.h> /* TODO: VxWorks RTP support */ @@ -61,7 +61,7 @@ static size_t context_extension_offset = 0; #define EXT(ctx) ((ContextExtensionVxWorks *)((char *)(ctx) + context_extension_offset)) -#include <tcf/system/pid-hash.h> +#include <tcf/framework/pid-hash.h> #define EVENT_HOOK_BREAKPOINT 2 #define EVENT_HOOK_STEP_DONE 3 diff --git a/agent/tcf/system/VxWorks/context-vxworks.h b/agent/system/VxWorks/tcf/context-vxworks.h index 0fd81105..0fd81105 100644 --- a/agent/tcf/system/VxWorks/context-vxworks.h +++ b/agent/system/VxWorks/tcf/context-vxworks.h diff --git a/agent/tcf/system/VxWorks/regset.h b/agent/system/VxWorks/tcf/regset.h index 0a12cb92..0a12cb92 100644 --- a/agent/tcf/system/VxWorks/regset.h +++ b/agent/system/VxWorks/tcf/regset.h diff --git a/agent/tcf/system/Windows/context-win32.c b/agent/system/Windows/tcf/context-win32.c index e85cbb11..9cf65927 100644 --- a/agent/tcf/system/Windows/context-win32.c +++ b/agent/system/Windows/tcf/context-win32.c @@ -37,9 +37,9 @@ #include <tcf/services/breakpoints.h> #include <tcf/services/memorymap.h> #include <tcf/services/runctrl.h> -#include <tcf/system/Windows/context-win32.h> -#include <tcf/system/Windows/regset.h> -#include <tcf/system/Windows/windbgcache.h> +#include <system/Windows/tcf/context-win32.h> +#include <system/Windows/tcf/regset.h> +#include <system/Windows/tcf/windbgcache.h> #if !defined(USE_HW_BPS) # define USE_HW_BPS 1 @@ -123,7 +123,7 @@ static unsigned exception_handler_cnt = 0; static MemoryErrorInfo mem_err_info; -#include <tcf/system/pid-hash.h> +#include <tcf/framework/pid-hash.h> #define EXCEPTION_DEBUGGER_IO 0x406D1388 diff --git a/agent/tcf/system/Windows/context-win32.h b/agent/system/Windows/tcf/context-win32.h index 8c49751e..8c49751e 100644 --- a/agent/tcf/system/Windows/context-win32.h +++ b/agent/system/Windows/tcf/context-win32.h diff --git a/agent/tcf/system/Windows/pthreads-win32.c b/agent/system/Windows/tcf/pthreads-win32.c index e6118798..08a64aa3 100644 --- a/agent/tcf/system/Windows/pthreads-win32.c +++ b/agent/system/Windows/tcf/pthreads-win32.c @@ -20,7 +20,7 @@ #include <assert.h> #include <tcf/framework/myalloc.h> #include <tcf/framework/errors.h> -#include <tcf/system/Windows/pthreads-win32.h> +#include <system/Windows/tcf/pthreads-win32.h> /********************************************************************* Support of pthreads on Windows is implemented according to diff --git a/agent/tcf/system/Windows/pthreads-win32.h b/agent/system/Windows/tcf/pthreads-win32.h index e98874e0..e98874e0 100644 --- a/agent/tcf/system/Windows/pthreads-win32.h +++ b/agent/system/Windows/tcf/pthreads-win32.h diff --git a/agent/tcf/system/Windows/regset.h b/agent/system/Windows/tcf/regset.h index fb4eab83..fb4eab83 100644 --- a/agent/tcf/system/Windows/regset.h +++ b/agent/system/Windows/tcf/regset.h diff --git a/agent/tcf/system/Windows/windbgcache.c b/agent/system/Windows/tcf/windbgcache.c index e6f094f2..cfd43476 100644 --- a/agent/tcf/system/Windows/windbgcache.c +++ b/agent/system/Windows/tcf/windbgcache.c @@ -33,8 +33,8 @@ #include <assert.h> #include <stdio.h> #include <wchar.h> -#include <tcf/system/Windows/windbgcache.h> -#include <tcf/system/Windows/context-win32.h> +#include <system/Windows/tcf/windbgcache.h> +#include <system/Windows/tcf/context-win32.h> #include <tcf/framework/trace.h> #include <tcf/framework/myalloc.h> #include <tcf/services/memorymap.h> diff --git a/agent/tcf/system/Windows/windbgcache.h b/agent/system/Windows/tcf/windbgcache.h index 670cad7d..670cad7d 100644 --- a/agent/tcf/system/Windows/windbgcache.h +++ b/agent/system/Windows/tcf/windbgcache.h diff --git a/agent/tcf/machine/cpudefs-ext.h b/agent/tcf/framework/cpudefs-ext.h index ca23b4d5..cc3f788c 100644 --- a/agent/tcf/machine/cpudefs-ext.h +++ b/agent/tcf/framework/cpudefs-ext.h @@ -20,7 +20,7 @@ * If it is not the case, this file needs to be substituted with alternative implementation. */ -#include <cpudefs-mdep.h> +#include <tcf/cpudefs-mdep.h> struct RegisterData { REG_SET data; diff --git a/agent/tcf/framework/cpudefs.c b/agent/tcf/framework/cpudefs.c index 5d9c5f5d..e31d922a 100644 --- a/agent/tcf/framework/cpudefs.c +++ b/agent/tcf/framework/cpudefs.c @@ -30,7 +30,8 @@ #include <tcf/framework/myalloc.h> #include <tcf/framework/exceptions.h> #include <tcf/services/symbols.h> -#include <tcf/machine/cpudefs-ext.h> + +#include <tcf/framework/cpudefs-ext.h> int read_reg_value(StackFrame * frame, RegisterDefinition * reg_def, uint64_t * value) { uint8_t buf[8]; diff --git a/agent/tcf/framework/mdep-threads.h b/agent/tcf/framework/mdep-threads.h index 1fe0a388..8247d613 100644 --- a/agent/tcf/framework/mdep-threads.h +++ b/agent/tcf/framework/mdep-threads.h @@ -26,7 +26,7 @@ #ifdef DISABLE_PTHREADS_WIN32 # include <pthread.h> #else -# include <tcf/system/Windows/pthreads-win32.h> +# include <system/Windows/tcf/pthreads-win32.h> #endif #elif defined(_WRS_KERNEL) diff --git a/agent/tcf/system/pid-hash.h b/agent/tcf/framework/pid-hash.h index 4843ec8c..4843ec8c 100644 --- a/agent/tcf/system/pid-hash.h +++ b/agent/tcf/framework/pid-hash.h diff --git a/agent/tcf/machine/i386/cpudefs-mdep.h b/agent/tcf/machine/i386/cpudefs-mdep.h deleted file mode 100644 index b51cedb5..00000000 --- a/agent/tcf/machine/i386/cpudefs-mdep.h +++ /dev/null @@ -1 +0,0 @@ -#include "tcf/machine/x86_64/cpudefs-mdep.h" diff --git a/agent/tcf/machine/i686/cpudefs-mdep.h b/agent/tcf/machine/i686/cpudefs-mdep.h deleted file mode 100644 index b51cedb5..00000000 --- a/agent/tcf/machine/i686/cpudefs-mdep.h +++ /dev/null @@ -1 +0,0 @@ -#include "tcf/machine/x86_64/cpudefs-mdep.h" diff --git a/agent/tcf/main/test.c b/agent/tcf/main/test.c index 1c5df005..4b236850 100644 --- a/agent/tcf/main/test.c +++ b/agent/tcf/main/test.c @@ -33,7 +33,7 @@ #include <tcf/services/diagnostics.h> #include <tcf/main/test.h> #if defined(WIN32) -# include <tcf/system/Windows/context-win32.h> +# include <system/Windows/tcf/context-win32.h> #endif #ifdef __cplusplus diff --git a/agent/tcf/machine/elf-mdep.h b/agent/tcf/services/dwarfreloc-ext.h index 3f7d9f51..4a397112 100644 --- a/agent/tcf/machine/elf-mdep.h +++ b/agent/tcf/services/dwarfreloc-ext.h @@ -15,7 +15,7 @@ #define elf_relocate elf_relocate_i386 -#include <tcf/machine/i386/elf-mdep.h> +#include <machine/i386/tcf/dwarfreloc-mdep.h> #undef elf_relocate static ElfRelocateFunc elf_relocate_funcs[] = { diff --git a/agent/tcf/services/dwarfreloc.c b/agent/tcf/services/dwarfreloc.c index 00d4d5cf..de933a2d 100644 --- a/agent/tcf/services/dwarfreloc.c +++ b/agent/tcf/services/dwarfreloc.c @@ -46,7 +46,7 @@ typedef struct ElfRelocateFunc { void (*func)(void); } ElfRelocateFunc; -#include <tcf/machine/elf-mdep.h> +#include <tcf/services/dwarfreloc-ext.h> static void relocate(void * r) { ElfRelocateFunc * func; diff --git a/agent/tcf/services/linenumbers_win32.c b/agent/tcf/services/linenumbers_win32.c index efdbf578..830beac5 100644 --- a/agent/tcf/services/linenumbers_win32.c +++ b/agent/tcf/services/linenumbers_win32.c @@ -31,8 +31,8 @@ #include <tcf/framework/context.h> #include <tcf/framework/exceptions.h> #include <tcf/services/linenumbers.h> -#include <tcf/system/Windows/windbgcache.h> -#include <tcf/system/Windows/context-win32.h> +#include <system/Windows/tcf/windbgcache.h> +#include <system/Windows/tcf/context-win32.h> int line_to_address(Context * ctx, char * file, int line, int column, LineNumbersCallBack * callback, void * user_args) { diff --git a/agent/tcf/services/symbols_win32.c b/agent/tcf/services/symbols_win32.c index 53ce1d60..56632517 100644 --- a/agent/tcf/services/symbols_win32.c +++ b/agent/tcf/services/symbols_win32.c @@ -33,8 +33,8 @@ #include <tcf/services/symbols.h> #include <tcf/services/stacktrace.h> #include <tcf/services/memorymap.h> -#include <tcf/system/Windows/windbgcache.h> -#include <tcf/system/Windows/context-win32.h> +#include <system/Windows/tcf/windbgcache.h> +#include <system/Windows/tcf/context-win32.h> #if ENABLE_RCBP_TEST # include <tcf/main/test.h> #endif diff --git a/server/server.vcproj b/server/server.vcproj index 3b6165b4..f458c3fb 100644 --- a/server/server.vcproj +++ b/server/server.vcproj @@ -247,6 +247,10 @@ >
</File>
<File
+ RelativePath="..\agent\tcf\services\dwarfreloc-ext.h"
+ >
+ </File>
+ <File
RelativePath="..\agent\tcf\services\dwarfreloc.c"
>
</File>
@@ -403,6 +407,10 @@ >
</File>
<File
+ RelativePath=".\tcf\framework\cpudefs-ext.h"
+ >
+ </File>
+ <File
RelativePath="..\agent\tcf\framework\cpudefs.c"
>
</File>
@@ -540,25 +548,13 @@ </File>
</Filter>
<Filter
- Name="machine"
- >
- <File
- RelativePath=".\tcf\machine\cpudefs-ext.h"
- >
- </File>
- <File
- RelativePath="..\agent\tcf\machine\elf-mdep.h"
- >
- </File>
- </Filter>
- <Filter
Name="system"
>
<Filter
Name="Windows"
>
<File
- RelativePath="..\agent\tcf\system\Windows\pthreads-win32.c"
+ RelativePath="..\agent\system\Windows\tcf\pthreads-win32.c"
>
</File>
</Filter>
diff --git a/server/tcf/machine/cpudefs-ext.h b/server/tcf/framework/cpudefs-ext.h index 88807707..88807707 100644 --- a/server/tcf/machine/cpudefs-ext.h +++ b/server/tcf/framework/cpudefs-ext.h diff --git a/tests/test-dwarf/tcf/backend/backend.c b/tests/test-dwarf/tcf/backend/backend.c index 1397e602..6c914a93 100644 --- a/tests/test-dwarf/tcf/backend/backend.c +++ b/tests/test-dwarf/tcf/backend/backend.c @@ -228,7 +228,7 @@ static void loc_var_func(void * args, Symbol * sym) { int ok = 0; if (name == NULL && type != NULL) { char * type_name; - int type_flags; + unsigned type_flags; if (get_symbol_name(type, &type_name) < 0) { error("get_symbol_name"); } diff --git a/tests/test-dwarf/tcf/machine/cpudefs-ext.h b/tests/test-dwarf/tcf/framework/cpudefs-ext.h index 18cb5704..18cb5704 100644 --- a/tests/test-dwarf/tcf/machine/cpudefs-ext.h +++ b/tests/test-dwarf/tcf/framework/cpudefs-ext.h |