From 523d345dca9cbd0bcee8a7bc9bf5370f0e882eb3 Mon Sep 17 00:00:00 2001 From: Andreas Arnez Date: Thu, 5 Dec 2019 18:22:43 +0100 Subject: [PATCH] s390x: Fix offsets in comments to VexGuestS390XState Each member of the structure declaration for `VexGuestS390XState' is commented with its offset within the structure. But starting with `guest_r0' and for all remaining members, these comments indicate the wrong offsets, and the actual offsets are 8 bytes higher. Adjust the comments accordingly. --- VEX/pub/libvex_guest_s390x.h | 66 ++++++++++++++++++------------------ 1 file changed, 33 insertions(+), 33 deletions(-) diff --git a/VEX/pub/libvex_guest_s390x.h b/VEX/pub/libvex_guest_s390x.h index b4e063f262..ec4d71bb45 100644 --- a/VEX/pub/libvex_guest_s390x.h +++ b/VEX/pub/libvex_guest_s390x.h @@ -107,72 +107,72 @@ typedef struct { /*--- gpr registers ---*/ /*------------------------------------------------------------*/ - /* 568 */ ULong guest_r0; - /* 576 */ ULong guest_r1; - /* 584 */ ULong guest_r2; - /* 592 */ ULong guest_r3; - /* 600 */ ULong guest_r4; - /* 608 */ ULong guest_r5; - /* 616 */ ULong guest_r6; - /* 624 */ ULong guest_r7; - /* 632 */ ULong guest_r8; - /* 640 */ ULong guest_r9; - /* 648 */ ULong guest_r10; - /* 656 */ ULong guest_r11; - /* 664 */ ULong guest_r12; - /* 672 */ ULong guest_r13; - /* 680 */ ULong guest_r14; - /* 688 */ ULong guest_r15; + /* 576 */ ULong guest_r0; + /* 584 */ ULong guest_r1; + /* 592 */ ULong guest_r2; + /* 600 */ ULong guest_r3; + /* 608 */ ULong guest_r4; + /* 616 */ ULong guest_r5; + /* 624 */ ULong guest_r6; + /* 632 */ ULong guest_r7; + /* 640 */ ULong guest_r8; + /* 648 */ ULong guest_r9; + /* 656 */ ULong guest_r10; + /* 664 */ ULong guest_r11; + /* 672 */ ULong guest_r12; + /* 680 */ ULong guest_r13; + /* 688 */ ULong guest_r14; + /* 696 */ ULong guest_r15; /*------------------------------------------------------------*/ /*--- S390 miscellaneous registers ---*/ /*------------------------------------------------------------*/ - /* 696 */ ULong guest_counter; - /* 704 */ UInt guest_fpc; - /* 708 */ UChar unused[4]; /* 4-byte hole to get 8-byte alignment */ - /* 712 */ ULong guest_IA; + /* 704 */ ULong guest_counter; + /* 712 */ UInt guest_fpc; + /* 716 */ UChar unused[4]; /* 4-byte hole to get 8-byte alignment */ + /* 720 */ ULong guest_IA; /*------------------------------------------------------------*/ /*--- S390 pseudo registers ---*/ /*------------------------------------------------------------*/ - /* 720 */ ULong guest_SYSNO; + /* 728 */ ULong guest_SYSNO; /*------------------------------------------------------------*/ /*--- 4-word thunk used to calculate the condition code ---*/ /*------------------------------------------------------------*/ - /* 728 */ ULong guest_CC_OP; - /* 736 */ ULong guest_CC_DEP1; - /* 744 */ ULong guest_CC_DEP2; - /* 752 */ ULong guest_CC_NDEP; + /* 736 */ ULong guest_CC_OP; + /* 744 */ ULong guest_CC_DEP1; + /* 752 */ ULong guest_CC_DEP2; + /* 760 */ ULong guest_CC_NDEP; /*------------------------------------------------------------*/ /*--- Pseudo registers. Required by all architectures ---*/ /*------------------------------------------------------------*/ /* See comments at bottom of libvex.h */ - /* 760 */ ULong guest_NRADDR; - /* 768 */ ULong guest_CMSTART; - /* 776 */ ULong guest_CMLEN; + /* 768 */ ULong guest_NRADDR; + /* 776 */ ULong guest_CMSTART; + /* 784 */ ULong guest_CMLEN; /* Used when backing up to restart a syscall that has been interrupted by a signal. See also comment in libvex_ir.h */ - /* 784 */ ULong guest_IP_AT_SYSCALL; + /* 792 */ ULong guest_IP_AT_SYSCALL; /* Emulation notes; see comments in libvex_emnote.h */ - /* 792 */ UInt guest_EMNOTE; + /* 800 */ UInt guest_EMNOTE; /* For translation chaining */ - /* 796 */ UInt host_EvC_COUNTER; - /* 800 */ ULong host_EvC_FAILADDR; + /* 804 */ UInt host_EvC_COUNTER; + /* 808 */ ULong host_EvC_FAILADDR; /*------------------------------------------------------------*/ /*--- Force alignment to 16 bytes ---*/ /*------------------------------------------------------------*/ - /* 808 */ UChar padding[0]; + /* 816 */ UChar padding[0]; /* 816 */ /* This is the size of the guest state */ } VexGuestS390XState; -- 2.47.2