diff options
| author | Andrew Burgess <andrew.burgess@embecosm.com> | 2019-04-11 23:17:31 +0100 |
|---|---|---|
| committer | Andrew Burgess <andrew.burgess@embecosm.com> | 2019-04-13 22:21:14 +0100 |
| commit | 798066abd8e5ec2a411979fd34bfe0cd494c1813 (patch) | |
| tree | d95b67ba097a9fdb6ea3a6bc0a50b28be49225cb /sim/common | |
| parent | bdc8beb41b656e8071af275ef0e98c4f2d05e564 (diff) | |
| download | gdb-798066abd8e5ec2a411979fd34bfe0cd494c1813.zip gdb-798066abd8e5ec2a411979fd34bfe0cd494c1813.tar.gz gdb-798066abd8e5ec2a411979fd34bfe0cd494c1813.tar.bz2 | |
sim: Use host not target byte order for merging and splitting values
When using writes to memory through a struct to merge and extract
multi-word value, it is the endianness of the host, not the target
that affects which order the component words need to be written into
the structure.
Of the 5 functions adjusted here 4 of them are unused. The 5th,
JOINSIDF will soon be used by the or1k target.
For or1k, simulated on x86-64, this change fixes this function so that
the correct bytes are now returned.
sim/common/ChangeLog:
* cgen-ops.h (SUBWORDXFSI): Compare HOST_BYTE_ORDER not
CURRENT_TARGET_BYTE_ORDER.
(SUBWORDTFSI): Likewise.
(JOINSIDF): Likewise.
(JOINSIXF): Likewise.
(JOINSITF): Likewise.
Diffstat (limited to 'sim/common')
| -rw-r--r-- | sim/common/ChangeLog | 9 | ||||
| -rw-r--r-- | sim/common/cgen-ops.h | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/sim/common/ChangeLog b/sim/common/ChangeLog index 21a2474..fce4702 100644 --- a/sim/common/ChangeLog +++ b/sim/common/ChangeLog @@ -1,3 +1,12 @@ +2019-04-13 Andrew Burgess <andrew.burgess@embecosm.com> + + * cgen-ops.h (SUBWORDXFSI): Compare HOST_BYTE_ORDER not + CURRENT_TARGET_BYTE_ORDER. + (SUBWORDTFSI): Likewise. + (JOINSIDF): Likewise. + (JOINSIXF): Likewise. + (JOINSITF): Likewise. + 2019-03-28 Andrew Burgess <andrew.burgess@embecosm.com> * sim-base.h: Add 'sim-assert.h' include. diff --git a/sim/common/cgen-ops.h b/sim/common/cgen-ops.h index 8415520..6fecb86 100644 --- a/sim/common/cgen-ops.h +++ b/sim/common/cgen-ops.h @@ -404,7 +404,7 @@ SUBWORDXFSI (XF in, int word) /* Note: typedef struct { SI parts[3]; } XF; */ union { XF in; SI out[3]; } x; x.in = in; - if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) return x.out[word]; else return x.out[2 - word]; @@ -416,7 +416,7 @@ SUBWORDTFSI (TF in, int word) /* Note: typedef struct { SI parts[4]; } TF; */ union { TF in; SI out[4]; } x; x.in = in; - if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) return x.out[word]; else return x.out[3 - word]; @@ -432,7 +432,7 @@ SEMOPS_INLINE DF JOINSIDF (SI x0, SI x1) { union { SI in[2]; DF out; } x; - if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) x.in[0] = x0, x.in[1] = x1; else x.in[1] = x0, x.in[0] = x1; @@ -443,7 +443,7 @@ SEMOPS_INLINE XF JOINSIXF (SI x0, SI x1, SI x2) { union { SI in[3]; XF out; } x; - if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) x.in[0] = x0, x.in[1] = x1, x.in[2] = x2; else x.in[2] = x0, x.in[1] = x1, x.in[0] = x2; @@ -454,7 +454,7 @@ SEMOPS_INLINE TF JOINSITF (SI x0, SI x1, SI x2, SI x3) { union { SI in[4]; TF out; } x; - if (CURRENT_TARGET_BYTE_ORDER == BFD_ENDIAN_BIG) + if (HOST_BYTE_ORDER == BFD_ENDIAN_BIG) x.in[0] = x0, x.in[1] = x1, x.in[2] = x2, x.in[3] = x3; else x.in[3] = x0, x.in[2] = x1, x.in[1] = x2, x.in[0] = x3; |