A major overhaul of all machinery to do with syscalls, but mostly of
the m_syscalls module. Fundamentally the aim of the overhaul is to
clean up the logic and abstractions surrounding syscalls in order that
we can cleanly support ppc32 and other new targets. Aims in detail:
* To further decouple the syscall PRE/POST wrappers from specifics of
how those values are stored on a given platform. The wrappers look
the same as they did before, mostly (eg, references to ARGn and
RES are unchanged), but now those macros refer to values in structs
SyscallArgs and SyscallStatus (see priv_types_n_macros.h).
* Complete overhaul of the driver logic for syscalls. The resulting
logic is algorithmically identical to what we had before, but is
more documented, and deals with moving arg/result data between
platform specific representations and the canonical forms in
structs SyscallArgs and SyscallStatus.
* Also as a result of this change, remove problems in the old logic
due to assignments of RES in PRE wrappers trashing the ARGs whilst
we still need to see them.
* Lots of other cleanups and documentation. There is extensive
commentary in syscalls-main.c.
The driver logic has been placed in its own file, syscalls-main.c.
New/deleted files in m_syscalls:
* syscalls.c is divided up into syscalls-main.c, containing driver
logic, and syscalls-generic.c, containing generic Unix wrappers.
* priv_syscalls.h is chopped up into priv_types_n_macros.h
and priv_syscalls-{generic,main}.h.
------------
All the above changes are in m_syscalls. However there is one
system-wide change as a result of all this.
The x86-linux assumption that syscall return values in the range -4095
.. -1 are errors and all others are values, has been done away with
everywhere. Instead there is a new basic type SysRes which holds a
system call result in a platform-neutral way.
Everywhere that previously an Int would have held a system call
result, there is now a SysRes in its place.
------------
Almost everything works on SuSE 9.1 (LinuxThreads) again. NPTL will
still be majorly broken; I will commit fixes shortly. AMD64 is also
totalled. I will get to that too.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3849 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/m_aspacemgr/aspacemgr.c b/coregrind/m_aspacemgr/aspacemgr.c
index 4eb20e2..343a4cb 100644
--- a/coregrind/m_aspacemgr/aspacemgr.c
+++ b/coregrind/m_aspacemgr/aspacemgr.c
@@ -590,7 +590,7 @@
len = VG_PGROUNDUP(len);
if (debug)
- VG_(printf)("unmap_range(%p, %lu)\n", addr, len);
+ VG_(printf)("unmap_range(%p, %llu)\n", addr, (ULong)len);
if (0) show_segments("unmap_range(BEFORE)");
end = addr+len;
@@ -698,6 +698,8 @@
static const Bool debug = False || mem_debug;
Segment* s;
Int idx;
+ HChar* stage2_suffix = "lib/valgrind/stage2";
+ Bool is_stage2 = VG_(strstr)(filename, stage2_suffix) != NULL;
if (debug)
VG_(printf)(
@@ -707,6 +709,8 @@
" filename='%s')\n",
addr, (ULong)len, prot, flags, dev, ino, off, filename);
+ if (0) show_segments("before map_file_segment");
+
/* Everything must be page-aligned */
vg_assert(VG_IS_PAGE_ALIGNED(addr));
len = VG_PGROUNDUP(len);
@@ -741,7 +745,9 @@
file, then try reading symbols from it.
*/
if (s->seginfo == NULL
- && (addr+len < VG_(valgrind_base) || addr > VG_(valgrind_last))
+ && ( (addr+len < VG_(valgrind_base) || addr > VG_(valgrind_last))
+ || is_stage2
+ )
&& (flags & (SF_MMAP|SF_NOSYMS)) == SF_MMAP) {
if (off == 0
&& s->fnIdx != -1
@@ -855,8 +861,8 @@
if (debug) {
VG_(printf)("\n\n");
- VG_(printf)("find_map_space(%p, %lu, %d) ...\n",
- addr, len, for_client);
+ VG_(printf)("find_map_space(%p, %llu, %d) ...\n",
+ addr, (ULong)len, for_client);
}
if (0) show_segments("find_map_space: start");
@@ -957,8 +963,8 @@
ret = 0; /* not found */
if (debug)
- VG_(printf)("find_map_space(%p, %lu, %d) -> %p\n\n",
- addr, len, for_client, ret);
+ VG_(printf)("find_map_space(%p, %llu, %d) -> %p\n\n",
+ addr, (ULong)len, for_client, ret);
if (fixed) {
vg_assert(ret == 0 || ret == addrOrig);
@@ -982,7 +988,7 @@
void VG_(pad_address_space)(Addr start)
{
Addr addr = (start == 0) ? VG_(client_base) : start;
- void* ret;
+ SysRes ret;
Int i = 0;
Segment* s = i >= segments_used ? NULL : &segments[i];
@@ -1010,7 +1016,7 @@
void VG_(unpad_address_space)(Addr start)
{
Addr addr = (start == 0) ? VG_(client_base) : start;
- Int ret;
+ SysRes ret;
Int i = 0;
Segment* s = i >= segments_used ? NULL : &segments[i];
@@ -1539,11 +1545,11 @@
0, // ! seg not present
1, // useable
};
- int ret = VG_(do_syscall3)(__NR_modify_ldt, 1, (UWord)&ldt, sizeof(ldt));
- if (ret < 0) {
+ SysRes ret = VG_(do_syscall3)(__NR_modify_ldt, 1, (UWord)&ldt, sizeof(ldt));
+ if (ret.isError) {
VG_(message)(Vg_UserMsg,
"Warning: ignoring --pointercheck=yes, "
- "because modify_ldt failed (errno=%d)", -ret);
+ "because modify_ldt failed (errno=%d)", ret.val);
return False;
} else {
return True;