Minor tidying: make initial_client_SP be a mandatory field in struct

_IIFinaliseImageInfo.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6359

diff --git a/coregrind/pub_core_initimg.h b/coregrind/pub_core_initimg.h
index a69220f01684bc9a003731aa34c674f813f48fb6..b63407b52411ba996d105b3ff05cb0a3eda380a0 100644 (file)
--- a/coregrind/pub_core_initimg.h
+++ b/coregrind/pub_core_initimg.h
@@ -82,8 +82,8 @@ struct _IICreateImageInfo {
 struct _IIFinaliseImageInfo {
    /* ------ Mandatory fields ------ */
    SizeT clstack_max_size;
-   /* ------ Per-OS fields ------ */
    Addr  initial_client_SP;
+   /* ------ Per-OS fields ------ */
    Addr  initial_client_IP;
    Addr  initial_client_TOC;
    UInt* client_auxv;
@@ -153,6 +153,9 @@ struct _IICreateImageInfo {
 struct _IIFinaliseImageInfo {
    /* ------ Mandatory fields ------ */
    SizeT clstack_max_size;
+   /* Initial value for SP (which is merely a copy of r1's value,
+      intregs37[1]). */
+   Addr initial_client_SP;
    /* ------ Per-OS fields ------ */
    /* Pointer to the preload page.  The preload page and this pointer
       to it are set up by VG_(ii_create_image). */
@@ -160,9 +163,6 @@ struct _IIFinaliseImageInfo {
    /* Initial values for guest int registers (GPR0 .. GPR31, PC,
       CR, LR, CTR, XER).  Copied from the CII. */
    ULong* intregs37;
-   /* Initial value for SP (which is merely a copy of r1's value,
-      intregs37[1]). */
-   Addr initial_client_SP;
    /* Address of the page compressed by the launcher. */
    Addr compressed_page;
    /* Adler32 checksum of uncompressed data of said page. */