david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

target-arm queue:

Browse Source 
* fix endianness handling in fwcfg wide registers
  * fix broken crypto insn emulation on big endian hosts
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1
 
 iQIcBAABCAAGBQJUuP44AAoJEDwlJe0UNgze1ccP/0yreLv1OT5iGozZrvzvHchA
 eniR6joJJd1G8vVDstDyjCY9tgfC8vV2udg7QMgAU9qp+yAhumTloCWBa6I6EsIZ
 nNqxu+vVFswFbfT9As7tdnVzuPu7tVnAUdFk0LTH8zyAJyBo7ZdErYFKapj0puiD
 BrXIn3ecgYz9VvjtB/wNfXNLOMzbSQzA2v93GORhF0VZeiJobH7DC+6cHl/dTChw
 v8+I4HHOtsJTPyVHZIPdDHeJ3NW5BbW4SjIGZymRPR37MV9NuRUFJ4Sv35jXGaoC
 yZ2y8MfBQWxwXftyvV/9fYhZorjdTWqKJkWsfTTTJ8SkxMy5Zxgkq/FH4VzeTy9b
 cHWpJxTb6zzQ/uj4h00Qs6jVP8A8hrQQJqLGPT7gFLii/GNoNNocBjKhyLckbh/N
 SamuwC+vZ0InLM7ywP7WsFPslChSi9ZsHbnRxI3s3OiU7v294eH7Es24n5Co4Qry
 uhfglurCfOxAe8cfjgcsO3zh6gLAj1W54XVmxUfx8uEE2uWZWt7BNOBGjmt1p8iu
 /+DLdADXi20HVuVvLHsHcasAXcEd1jLOZU9IkKKl6FMCxIQpz12fslrCxvjSq+ay
 1aj8eBLIdBWEB/HY8OufsUBvg2YZvLGMsgL2PJ39UpHS0T3AUhD8SEE/k2829coc
 LFEJqFlLy+e9PyFw4XeV
 =0R3Z
 -----END PGP SIGNATURE-----

Merge remote-tracking branch 'remotes/pmaydell/tags/pull-target-arm-20150116' into staging

target-arm queue:
 * fix endianness handling in fwcfg wide registers
 * fix broken crypto insn emulation on big endian hosts

# gpg: Signature made Fri 16 Jan 2015 12:04:08 GMT using RSA key ID 14360CDE
# gpg: Good signature from "Peter Maydell <peter.maydell@linaro.org>"

* remotes/pmaydell/tags/pull-target-arm-20150116:
  fw_cfg: fix endianness in fw_cfg_data_mem_read() / _write()
  target-arm: crypto: fix BE host support

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2015-01-16 12:06:41 +00:00
commit 1e42c35346
2 changed files with 65 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
hw/nvram/fw_cfg.c
View File

@ -287,51 +287,24 @@ static uint64_t fw_cfg_data_mem_read(void *opaque, hwaddr addr,
unsigned size) unsigned size)
{ {
FWCfgState *s = opaque; FWCfgState *s = opaque;
uint8_t buf[8]; uint64_t value = 0;
unsigned i; unsigned i;
for (i = 0; i < size; ++i) { for (i = 0; i < size; ++i) {
buf[i] = fw_cfg_read(s); value = (value << 8) | fw_cfg_read(s);
} }
switch (size) { return value;
case 1:
return buf[0];
case 2:
return lduw_he_p(buf);
case 4:
return (uint32_t)ldl_he_p(buf);
case 8:
return ldq_he_p(buf);
}
abort();
} }
static void fw_cfg_data_mem_write(void *opaque, hwaddr addr, static void fw_cfg_data_mem_write(void *opaque, hwaddr addr,
uint64_t value, unsigned size) uint64_t value, unsigned size)
{ {
FWCfgState *s = opaque; FWCfgState *s = opaque;
uint8_t buf[8]; unsigned i = size;
unsigned i;
switch (size) { do {
case 1: fw_cfg_write(s, value >> (8 * --i));
buf[0] = value; } while (i);
break;
case 2:
stw_he_p(buf, value);
break;
case 4:
stl_he_p(buf, value);
break;
case 8:
stq_he_p(buf, value);
break;
default:
abort();
}
for (i = 0; i < size; ++i) {
fw_cfg_write(s, buf[i]);
}
} }
static bool fw_cfg_data_mem_valid(void *opaque, hwaddr addr, static bool fw_cfg_data_mem_valid(void *opaque, hwaddr addr,

104
target-arm/crypto_helper.c
View File

@ -22,6 +22,14 @@ union CRYPTO_STATE {
uint64_t l[2]; uint64_t l[2];
}; };
#ifdef HOST_WORDS_BIGENDIAN
#define CR_ST_BYTE(state, i) (state.bytes[(15 - (i)) ^ 8])
#define CR_ST_WORD(state, i) (state.words[(3 - (i)) ^ 2])
#else
#define CR_ST_BYTE(state, i) (state.bytes[i])
#define CR_ST_WORD(state, i) (state.words[i])
#endif
void HELPER(crypto_aese)(CPUARMState *env, uint32_t rd, uint32_t rm, void HELPER(crypto_aese)(CPUARMState *env, uint32_t rd, uint32_t rm,
uint32_t decrypt) uint32_t decrypt)
{ {
@ -46,7 +54,7 @@ void HELPER(crypto_aese)(CPUARMState *env, uint32_t rd, uint32_t rm,
/* combine ShiftRows operation and sbox substitution */ /* combine ShiftRows operation and sbox substitution */
for (i = 0; i < 16; i++) { for (i = 0; i < 16; i++) {
st.bytes[i] = sbox[decrypt][rk.bytes[shift[decrypt][i]]]; CR_ST_BYTE(st, i) = sbox[decrypt][CR_ST_BYTE(rk, shift[decrypt][i])];
} }
env->vfp.regs[rd] = make_float64(st.l[0]); env->vfp.regs[rd] = make_float64(st.l[0]);
@ -198,11 +206,11 @@ void HELPER(crypto_aesmc)(CPUARMState *env, uint32_t rd, uint32_t rm,
assert(decrypt < 2); assert(decrypt < 2);
for (i = 0; i < 16; i += 4) { for (i = 0; i < 16; i += 4) {
st.words[i >> 2] = cpu_to_le32( CR_ST_WORD(st, i >> 2) =
mc[decrypt][st.bytes[i]] ^ mc[decrypt][CR_ST_BYTE(st, i)] ^
rol32(mc[decrypt][st.bytes[i + 1]], 8) ^ rol32(mc[decrypt][CR_ST_BYTE(st, i + 1)], 8) ^
rol32(mc[decrypt][st.bytes[i + 2]], 16) ^ rol32(mc[decrypt][CR_ST_BYTE(st, i + 2)], 16) ^
rol32(mc[decrypt][st.bytes[i + 3]], 24)); rol32(mc[decrypt][CR_ST_BYTE(st, i + 3)], 24);
} }
env->vfp.regs[rd] = make_float64(st.l[0]); env->vfp.regs[rd] = make_float64(st.l[0]);
@ -255,24 +263,25 @@ void HELPER(crypto_sha1_3reg)(CPUARMState *env, uint32_t rd, uint32_t rn,
switch (op) { switch (op) {
case 0: /* sha1c */ case 0: /* sha1c */
t = cho(d.words[1], d.words[2], d.words[3]); t = cho(CR_ST_WORD(d, 1), CR_ST_WORD(d, 2), CR_ST_WORD(d, 3));
break; break;
case 1: /* sha1p */ case 1: /* sha1p */
t = par(d.words[1], d.words[2], d.words[3]); t = par(CR_ST_WORD(d, 1), CR_ST_WORD(d, 2), CR_ST_WORD(d, 3));
break; break;
case 2: /* sha1m */ case 2: /* sha1m */
t = maj(d.words[1], d.words[2], d.words[3]); t = maj(CR_ST_WORD(d, 1), CR_ST_WORD(d, 2), CR_ST_WORD(d, 3));
break; break;
default: default:
g_assert_not_reached(); g_assert_not_reached();
} }
t += rol32(d.words[0], 5) + n.words[0] + m.words[i]; t += rol32(CR_ST_WORD(d, 0), 5) + CR_ST_WORD(n, 0)
+ CR_ST_WORD(m, i);
n.words[0] = d.words[3]; CR_ST_WORD(n, 0) = CR_ST_WORD(d, 3);
d.words[3] = d.words[2]; CR_ST_WORD(d, 3) = CR_ST_WORD(d, 2);
d.words[2] = ror32(d.words[1], 2); CR_ST_WORD(d, 2) = ror32(CR_ST_WORD(d, 1), 2);
d.words[1] = d.words[0]; CR_ST_WORD(d, 1) = CR_ST_WORD(d, 0);
d.words[0] = t; CR_ST_WORD(d, 0) = t;
} }
} }
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
@ -286,8 +295,8 @@ void HELPER(crypto_sha1h)(CPUARMState *env, uint32_t rd, uint32_t rm)
float64_val(env->vfp.regs[rm + 1]) float64_val(env->vfp.regs[rm + 1])
} }; } };
m.words[0] = ror32(m.words[0], 2); CR_ST_WORD(m, 0) = ror32(CR_ST_WORD(m, 0), 2);
m.words[1] = m.words[2] = m.words[3] = 0; CR_ST_WORD(m, 1) = CR_ST_WORD(m, 2) = CR_ST_WORD(m, 3) = 0;
env->vfp.regs[rd] = make_float64(m.l[0]); env->vfp.regs[rd] = make_float64(m.l[0]);
env->vfp.regs[rd + 1] = make_float64(m.l[1]); env->vfp.regs[rd + 1] = make_float64(m.l[1]);
@ -304,10 +313,10 @@ void HELPER(crypto_sha1su1)(CPUARMState *env, uint32_t rd, uint32_t rm)
float64_val(env->vfp.regs[rm + 1]) float64_val(env->vfp.regs[rm + 1])
} }; } };
d.words[0] = rol32(d.words[0] ^ m.words[1], 1); CR_ST_WORD(d, 0) = rol32(CR_ST_WORD(d, 0) ^ CR_ST_WORD(m, 1), 1);
d.words[1] = rol32(d.words[1] ^ m.words[2], 1); CR_ST_WORD(d, 1) = rol32(CR_ST_WORD(d, 1) ^ CR_ST_WORD(m, 2), 1);
d.words[2] = rol32(d.words[2] ^ m.words[3], 1); CR_ST_WORD(d, 2) = rol32(CR_ST_WORD(d, 2) ^ CR_ST_WORD(m, 3), 1);
d.words[3] = rol32(d.words[3] ^ d.words[0], 1); CR_ST_WORD(d, 3) = rol32(CR_ST_WORD(d, 3) ^ CR_ST_WORD(d, 0), 1);
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
env->vfp.regs[rd + 1] = make_float64(d.l[1]); env->vfp.regs[rd + 1] = make_float64(d.l[1]);
@ -356,20 +365,22 @@ void HELPER(crypto_sha256h)(CPUARMState *env, uint32_t rd, uint32_t rn,
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
uint32_t t = cho(n.words[0], n.words[1], n.words[2]) + n.words[3] uint32_t t = cho(CR_ST_WORD(n, 0), CR_ST_WORD(n, 1), CR_ST_WORD(n, 2))
+ S1(n.words[0]) + m.words[i]; + CR_ST_WORD(n, 3) + S1(CR_ST_WORD(n, 0))
+ CR_ST_WORD(m, i);
n.words[3] = n.words[2]; CR_ST_WORD(n, 3) = CR_ST_WORD(n, 2);
n.words[2] = n.words[1]; CR_ST_WORD(n, 2) = CR_ST_WORD(n, 1);
n.words[1] = n.words[0]; CR_ST_WORD(n, 1) = CR_ST_WORD(n, 0);
n.words[0] = d.words[3] + t; CR_ST_WORD(n, 0) = CR_ST_WORD(d, 3) + t;
t += maj(d.words[0], d.words[1], d.words[2]) + S0(d.words[0]); t += maj(CR_ST_WORD(d, 0), CR_ST_WORD(d, 1), CR_ST_WORD(d, 2))
+ S0(CR_ST_WORD(d, 0));
d.words[3] = d.words[2]; CR_ST_WORD(d, 3) = CR_ST_WORD(d, 2);
d.words[2] = d.words[1]; CR_ST_WORD(d, 2) = CR_ST_WORD(d, 1);
d.words[1] = d.words[0]; CR_ST_WORD(d, 1) = CR_ST_WORD(d, 0);
d.words[0] = t; CR_ST_WORD(d, 0) = t;
} }
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
@ -394,13 +405,14 @@ void HELPER(crypto_sha256h2)(CPUARMState *env, uint32_t rd, uint32_t rn,
int i; int i;
for (i = 0; i < 4; i++) { for (i = 0; i < 4; i++) {
uint32_t t = cho(d.words[0], d.words[1], d.words[2]) + d.words[3] uint32_t t = cho(CR_ST_WORD(d, 0), CR_ST_WORD(d, 1), CR_ST_WORD(d, 2))
+ S1(d.words[0]) + m.words[i]; + CR_ST_WORD(d, 3) + S1(CR_ST_WORD(d, 0))
+ CR_ST_WORD(m, i);
d.words[3] = d.words[2]; CR_ST_WORD(d, 3) = CR_ST_WORD(d, 2);
d.words[2] = d.words[1]; CR_ST_WORD(d, 2) = CR_ST_WORD(d, 1);
d.words[1] = d.words[0]; CR_ST_WORD(d, 1) = CR_ST_WORD(d, 0);
d.words[0] = n.words[3 - i] + t; CR_ST_WORD(d, 0) = CR_ST_WORD(n, 3 - i) + t;
} }
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
@ -418,10 +430,10 @@ void HELPER(crypto_sha256su0)(CPUARMState *env, uint32_t rd, uint32_t rm)
float64_val(env->vfp.regs[rm + 1]) float64_val(env->vfp.regs[rm + 1])
} }; } };
d.words[0] += s0(d.words[1]); CR_ST_WORD(d, 0) += s0(CR_ST_WORD(d, 1));
d.words[1] += s0(d.words[2]); CR_ST_WORD(d, 1) += s0(CR_ST_WORD(d, 2));
d.words[2] += s0(d.words[3]); CR_ST_WORD(d, 2) += s0(CR_ST_WORD(d, 3));
d.words[3] += s0(m.words[0]); CR_ST_WORD(d, 3) += s0(CR_ST_WORD(m, 0));
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
env->vfp.regs[rd + 1] = make_float64(d.l[1]); env->vfp.regs[rd + 1] = make_float64(d.l[1]);
@ -443,10 +455,10 @@ void HELPER(crypto_sha256su1)(CPUARMState *env, uint32_t rd, uint32_t rn,
float64_val(env->vfp.regs[rm + 1]) float64_val(env->vfp.regs[rm + 1])
} }; } };
d.words[0] += s1(m.words[2]) + n.words[1]; CR_ST_WORD(d, 0) += s1(CR_ST_WORD(m, 2)) + CR_ST_WORD(n, 1);
d.words[1] += s1(m.words[3]) + n.words[2]; CR_ST_WORD(d, 1) += s1(CR_ST_WORD(m, 3)) + CR_ST_WORD(n, 2);
d.words[2] += s1(d.words[0]) + n.words[3]; CR_ST_WORD(d, 2) += s1(CR_ST_WORD(d, 0)) + CR_ST_WORD(n, 3);
d.words[3] += s1(d.words[1]) + m.words[0]; CR_ST_WORD(d, 3) += s1(CR_ST_WORD(d, 1)) + CR_ST_WORD(m, 0);
env->vfp.regs[rd] = make_float64(d.l[0]); env->vfp.regs[rd] = make_float64(d.l[0]);
env->vfp.regs[rd + 1] = make_float64(d.l[1]); env->vfp.regs[rd + 1] = make_float64(d.l[1]);