Cleaned up ume.h by moving some functions around.
git-svn-id: svn://svn.valgrind.org/valgrind/trunk@2756 a5019735-40e9-0310-863c-91ae7b9d1cf9
diff --git a/coregrind/ume.h b/coregrind/ume.h
index d59b9e9..1d7cef9 100644
--- a/coregrind/ume.h
+++ b/coregrind/ume.h
@@ -39,6 +39,15 @@
/*--- General stuff ---*/
/*------------------------------------------------------------*/
+void foreach_map(int (*fn)(char *start, char *end,
+ const char *perm, off_t offset,
+ int maj, int min, int ino, void* extra),
+ void* extra);
+
+/*------------------------------------------------------------*/
+/*--- Loading ELF files ---*/
+/*------------------------------------------------------------*/
+
#if ELFSZ == 64
#define ESZ(x) Elf64_##x
#elif ELFSZ == 32
@@ -50,15 +59,6 @@
/* Integer type the same size as a pointer */
typedef ESZ(Addr) addr_t;
-void foreach_map(int (*fn)(char *start, char *end,
- const char *perm, off_t offset,
- int maj, int min, int ino, void* extra),
- void* extra);
-
-/*------------------------------------------------------------*/
-/*--- Loading ELF files ---*/
-/*------------------------------------------------------------*/
-
// Info needed to load and run a program. IN/INOUT/OUT refers to the
// inputs/outputs of do_exec().
struct exeinfo
@@ -88,16 +88,6 @@
int do_exec(const char *exe, struct exeinfo *info);
/*------------------------------------------------------------*/
-/*--- Address space padding ---*/
-/*------------------------------------------------------------*/
-
-// Padding functions used at startup to force things where we want them.
-int as_openpadfile (void);
-void as_pad (void *start, void *end, int padfile);
-void as_unpad (void *start, void *end, int padfile);
-void as_closepadfile(int padfile);
-
-/*------------------------------------------------------------*/
/*--- Finding and dealing with auxv ---*/
/*------------------------------------------------------------*/