ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

* block/iscsi: fix double-free on BUSY or similar statuses 

* catch [accel] entry without accelerator
 * target/i386: various fixes for BMI and ADX instructions
 * make the contents of meson-buildoptions.sh stable
 -----BEGIN PGP SIGNATURE-----
 
 iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmPpDTcUHHBib256aW5p
 QHJlZGhhdC5jb20ACgkQv/vSX3jHroODWAgAhWi0XSBe91+34ahQqx6JoLStNX9e
 xy1Cm/5LPDrDquD/4T6gnzb1Min/X2AsVu9c+VIbuHbL/rFc7aNIEL6c7KzwSFLs
 vEDF7tSnlIMK0ClDsDYBz7HUIgBgqE2crAJmTJus2Cqd+Ef5bMxhQi5Imrk6qtmO
 HRdVYEGasJ7CO50oUB91AMrNInWQw0qBnBOB8TnwTLTcvE1txa+xnZuZgQA2HrGX
 OweLdKRcYPvRYvBB3wLMbwqEKbD1eYbdbNt7T2KkuVQpYcgfoCpayHIIMroD+hvu
 BImmG9wWieDKH4Brs765gH6/3VF5UZKbgDQo9Wz+W/5QqnqRSsOYBiMkmA==
 =G3PN
 -----END PGP SIGNATURE-----

Merge tag 'for-upstream' of https://gitlab.com/bonzini/qemu into staging

* block/iscsi: fix double-free on BUSY or similar statuses
* catch [accel] entry without accelerator
* target/i386: various fixes for BMI and ADX instructions
* make the contents of meson-buildoptions.sh stable

# -----BEGIN PGP SIGNATURE-----
#
# iQFIBAABCAAyFiEE8TM4V0tmI4mGbHaCv/vSX3jHroMFAmPpDTcUHHBib256aW5p
# QHJlZGhhdC5jb20ACgkQv/vSX3jHroODWAgAhWi0XSBe91+34ahQqx6JoLStNX9e
# xy1Cm/5LPDrDquD/4T6gnzb1Min/X2AsVu9c+VIbuHbL/rFc7aNIEL6c7KzwSFLs
# vEDF7tSnlIMK0ClDsDYBz7HUIgBgqE2crAJmTJus2Cqd+Ef5bMxhQi5Imrk6qtmO
# HRdVYEGasJ7CO50oUB91AMrNInWQw0qBnBOB8TnwTLTcvE1txa+xnZuZgQA2HrGX
# OweLdKRcYPvRYvBB3wLMbwqEKbD1eYbdbNt7T2KkuVQpYcgfoCpayHIIMroD+hvu
# BImmG9wWieDKH4Brs765gH6/3VF5UZKbgDQo9Wz+W/5QqnqRSsOYBiMkmA==
# =G3PN
# -----END PGP SIGNATURE-----
# gpg: Signature made Sun 12 Feb 2023 16:00:55 GMT
# gpg:                using RSA key F13338574B662389866C7682BFFBD25F78C7AE83
# gpg:                issuer "pbonzini@redhat.com"
# gpg: Good signature from "Paolo Bonzini <bonzini@gnu.org>" [full]
# gpg:                 aka "Paolo Bonzini <pbonzini@redhat.com>" [full]
# Primary key fingerprint: 46F5 9FBD 57D6 12E7 BFD4  E2F7 7E15 100C CD36 69B1
#      Subkey fingerprint: F133 3857 4B66 2389 866C  7682 BFFB D25F 78C7 AE83

* tag 'for-upstream' of https://gitlab.com/bonzini/qemu:
  libqtest: ensure waitpid() is only called once
  libqtest: split qtest_spawn_qemu function
  target/i386: fix ADOX followed by ADCX
  target/i386: Fix C flag for BLSI, BLSMSK, BLSR
  target/i386: Fix BEXTR instruction
  tests/tcg/i386: Introduce and use reg_t consistently
  vl: catch [accel] entry without accelerator
  block/iscsi: fix double-free on BUSY or similar statuses
  remove unnecessary extern "C" blocks
  build: make meson-buildoptions.sh stable

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Peter Maydell 2023-02-16 11:16:39 +00:00
parent 0dd47dc547 12008ff748
commit 003ba52a8b
15 changed files with 316 additions and 234 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
block/iscsi.c
View File

@ -269,6 +269,7 @@ iscsi_co_generic_cb(struct iscsi_context *iscsi, int status,
timer_mod(&iTask->retry_timer,
qemu_clock_get_ms(QEMU_CLOCK_REALTIME) + retry_time);
iTask->do_retry = 1;
return;
} else if (status == SCSI_STATUS_CHECK_CONDITION) {
int error = iscsi_translate_sense(&task->sense);
if (error == EAGAIN) {

8
include/disas/dis-asm.h
View File

@ -11,10 +11,6 @@
#include "qemu/bswap.h"
#ifdef __cplusplus
extern "C" {
#endif
typedef void *PTR;
typedef uint64_t bfd_vma;
typedef int64_t bfd_signed_vma;
@ -506,8 +502,4 @@ static inline bfd_vma bfd_getb16(const bfd_byte *addr)
typedef bool bfd_boolean;
#ifdef __cplusplus
}
#endif
#endif /* DISAS_DIS_ASM_H */

8
include/qemu/bswap.h
View File

@ -1,10 +1,6 @@
#ifndef BSWAP_H
#define BSWAP_H
#ifdef __cplusplus
extern "C" {
#endif
#undef bswap16
#define bswap16(_x) __builtin_bswap16(_x)
#undef bswap32
@ -395,8 +391,4 @@ DO_STN_LDN_P(be)
#undef le_bswaps
#undef be_bswaps
#ifdef __cplusplus
}
#endif
#endif /* BSWAP_H */

8
include/qemu/envlist.h
View File

@ -1,10 +1,6 @@
#ifndef ENVLIST_H
#define ENVLIST_H
#ifdef __cplusplus
extern "C" {
#endif
typedef struct envlist envlist_t;
envlist_t *envlist_create(void);
@ -15,8 +11,4 @@ int envlist_parse_set(envlist_t *, const char *);
int envlist_parse_unset(envlist_t *, const char *);
char **envlist_to_environ(const envlist_t *, size_t *);
#ifdef __cplusplus
}
#endif
#endif /* ENVLIST_H */

8
include/qemu/rcu.h
View File

@ -31,10 +31,6 @@
#include "qemu/sys_membarrier.h"
#include "qemu/coroutine-tls.h"
#ifdef __cplusplus
extern "C" {
#endif
/*
* Important !
*
@ -196,8 +192,4 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(RCUReadAuto, rcu_read_auto_unlock)
void rcu_add_force_rcu_notifier(Notifier *n);
void rcu_remove_force_rcu_notifier(Notifier *n);
#ifdef __cplusplus
}
#endif
#endif /* QEMU_RCU_H */

8
include/qemu/rcu_queue.h
View File

@ -28,11 +28,6 @@
#include "qemu/queue.h"
#include "qemu/atomic.h"
#ifdef __cplusplus
extern "C" {
#endif
/*
* List access methods.
*/
@ -311,7 +306,4 @@ extern "C" {
(var) && ((next) = qatomic_rcu_read(&(var)->field.sle_next), 1); \
(var) = (next))
#ifdef __cplusplus
}
#endif
#endif /* QEMU_RCU_QUEUE_H */

7
include/qemu/uri.h
View File

@ -53,10 +53,6 @@
#ifndef QEMU_URI_H
#define QEMU_URI_H
#ifdef __cplusplus
extern "C" {
#endif
/**
* URI:
*
@ -105,7 +101,4 @@ struct QueryParams *query_params_new (int init_alloc);
extern QueryParams *query_params_parse (const char *query);
extern void query_params_free (QueryParams *ps);
#ifdef __cplusplus
}
#endif
#endif /* QEMU_URI_H */

7
scripts/meson-buildoptions.py
View File

@ -61,7 +61,10 @@ LINE_WIDTH = 76
# Convert the default value of an option to the string used in
# the help message
def value_to_help(value):
def get_help(opt):
if opt["name"] == "libdir":
return 'system default'
value = opt["value"]
if isinstance(value, list):
return ",".join(value)
if isinstance(value, bool):
@ -88,7 +91,7 @@ def sh_print(line=""):
def help_line(left, opt, indent, long):
right = f'{opt["description"]}'
if long:
value = value_to_help(opt["value"])
value = get_help(opt)
if value != "auto" and value != "":
right += f" [{value}]"
if "choices" in opt and long:

2
scripts/meson-buildoptions.sh
View File

@ -49,7 +49,7 @@ meson_options_help() {
printf "%s\n" ' --includedir=VALUE Header file directory [include]'
printf "%s\n" ' --interp-prefix=VALUE where to find shared libraries etc., use %M for'
printf "%s\n" ' cpu name [/usr/gnemul/qemu-%M]'
printf "%s\n" ' --libdir=VALUE Library directory [lib64]'
printf "%s\n" ' --libdir=VALUE Library directory [system default]'
printf "%s\n" ' --libexecdir=VALUE Library executable directory [libexec]'
printf "%s\n" ' --localedir=VALUE Locale data directory [share/locale]'
printf "%s\n" ' --localstatedir=VALUE Localstate data directory [/var/local]'

15
softmmu/vl.c
View File

@ -2204,14 +2204,18 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
int ret;
bool qtest_with_kvm;
if (!acc) {
error_setg(errp, QERR_MISSING_PARAMETER, "accel");
goto bad;
}
qtest_with_kvm = g_str_equal(acc, "kvm") && qtest_chrdev != NULL;
if (!ac) {
*p_init_failed = true;
if (!qtest_with_kvm) {
error_report("invalid accelerator %s", acc);
}
return 0;
goto bad;
}
accel = ACCEL(object_new_with_class(OBJECT_CLASS(ac)));
object_apply_compat_props(OBJECT(accel));
@ -2221,14 +2225,17 @@ static int do_configure_accelerator(void *opaque, QemuOpts *opts, Error **errp)
ret = accel_init_machine(accel, current_machine);
if (ret < 0) {
*p_init_failed = true;
if (!qtest_with_kvm || ret != -ENOENT) {
error_report("failed to initialize %s: %s", acc, strerror(-ret));
}
return 0;
goto bad;
}
return 1;
bad:
*p_init_failed = true;
return 0;
}
static void configure_accelerators(const char *progname)

45
target/i386/tcg/emit.c.inc
View File

@ -1015,6 +1015,7 @@ VSIB_AVX(VPGATHERQ, vpgatherq)
static void gen_ADCOX(DisasContext *s, CPUX86State *env, MemOp ot, int cc_op)
{
int opposite_cc_op;
TCGv carry_in = NULL;
TCGv carry_out = (cc_op == CC_OP_ADCX ? cpu_cc_dst : cpu_cc_src2);
TCGv zero;
@ -1022,14 +1023,8 @@ static void gen_ADCOX(DisasContext *s, CPUX86State *env, MemOp ot, int cc_op)
if (cc_op == s->cc_op || s->cc_op == CC_OP_ADCOX) {
/* Re-use the carry-out from a previous round. */
carry_in = carry_out;
cc_op = s->cc_op;
} else if (s->cc_op == CC_OP_ADCX || s->cc_op == CC_OP_ADOX) {
/* Merge with the carry-out from the opposite instruction. */
cc_op = CC_OP_ADCOX;
}
/* If we don't have a carry-in, get it out of EFLAGS. */
if (!carry_in) {
} else {
/* We don't have a carry-in, get it out of EFLAGS. */
if (s->cc_op != CC_OP_ADCX && s->cc_op != CC_OP_ADOX) {
gen_compute_eflags(s);
}
@ -1053,7 +1048,14 @@ static void gen_ADCOX(DisasContext *s, CPUX86State *env, MemOp ot, int cc_op)
tcg_gen_add2_tl(s->T0, carry_out, s->T0, carry_out, s->T1, zero);
break;
}
set_cc_op(s, cc_op);
opposite_cc_op = cc_op == CC_OP_ADCX ? CC_OP_ADOX : CC_OP_ADCX;
if (s->cc_op == CC_OP_ADCOX || s->cc_op == opposite_cc_op) {
/* Merge with the carry-out from the opposite instruction. */
set_cc_op(s, CC_OP_ADCOX);
} else {
set_cc_op(s, cc_op);
}
}
static void gen_ADCX(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode)
@ -1078,30 +1080,30 @@ static void gen_ANDN(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode)
static void gen_BEXTR(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode)
{
MemOp ot = decode->op[0].ot;
TCGv bound, zero;
TCGv bound = tcg_constant_tl(ot == MO_64 ? 63 : 31);
TCGv zero = tcg_constant_tl(0);
TCGv mone = tcg_constant_tl(-1);
/*
* Extract START, and shift the operand.
* Shifts larger than operand size get zeros.
*/
tcg_gen_ext8u_tl(s->A0, s->T1);
if (TARGET_LONG_BITS == 64 && ot == MO_32) {
tcg_gen_ext32u_tl(s->T0, s->T0);
}
tcg_gen_shr_tl(s->T0, s->T0, s->A0);
bound = tcg_constant_tl(ot == MO_64 ? 63 : 31);
zero = tcg_constant_tl(0);
tcg_gen_movcond_tl(TCG_COND_LEU, s->T0, s->A0, bound, s->T0, zero);
/*
* Extract the LEN into a mask. Lengths larger than
* operand size get all ones.
* Extract the LEN into an inverse mask. Lengths larger than
* operand size get all zeros, length 0 gets all ones.
*/
tcg_gen_extract_tl(s->A0, s->T1, 8, 8);
tcg_gen_movcond_tl(TCG_COND_LEU, s->A0, s->A0, bound, s->A0, bound);
tcg_gen_movi_tl(s->T1, 1);
tcg_gen_shl_tl(s->T1, s->T1, s->A0);
tcg_gen_subi_tl(s->T1, s->T1, 1);
tcg_gen_and_tl(s->T0, s->T0, s->T1);
tcg_gen_shl_tl(s->T1, mone, s->A0);
tcg_gen_movcond_tl(TCG_COND_LEU, s->T1, s->A0, bound, s->T1, zero);
tcg_gen_andc_tl(s->T0, s->T0, s->T1);
gen_op_update1_cc(s);
set_cc_op(s, CC_OP_LOGICB + ot);
@ -1111,6 +1113,7 @@ static void gen_BLSI(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode)
{
MemOp ot = decode->op[0].ot;
tcg_gen_mov_tl(cpu_cc_src, s->T0);
tcg_gen_neg_tl(s->T1, s->T0);
tcg_gen_and_tl(s->T0, s->T0, s->T1);
tcg_gen_mov_tl(cpu_cc_dst, s->T0);
@ -1121,6 +1124,7 @@ static void gen_BLSMSK(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode
{
MemOp ot = decode->op[0].ot;
tcg_gen_mov_tl(cpu_cc_src, s->T0);
tcg_gen_subi_tl(s->T1, s->T0, 1);
tcg_gen_xor_tl(s->T0, s->T0, s->T1);
tcg_gen_mov_tl(cpu_cc_dst, s->T0);
@ -1131,6 +1135,7 @@ static void gen_BLSR(DisasContext *s, CPUX86State *env, X86DecodedInsn *decode)
{
MemOp ot = decode->op[0].ot;
tcg_gen_mov_tl(cpu_cc_src, s->T0);
tcg_gen_subi_tl(s->T1, s->T0, 1);
tcg_gen_and_tl(s->T0, s->T0, s->T1);
tcg_gen_mov_tl(cpu_cc_dst, s->T0);

158
tests/qtest/libqtest.c
View File

@ -158,6 +158,7 @@ bool qtest_probe_child(QTestState *s)
CloseHandle((HANDLE)pid);
#endif
s->qemu_pid = -1;
qtest_remove_abrt_handler(s);
}
return false;
}
@ -169,6 +170,8 @@ void qtest_set_expected_status(QTestState *s, int status)
static void qtest_check_status(QTestState *s)
{
assert(s->qemu_pid == -1);
/*
* Check whether qemu exited with expected exit status; anything else is
* fishy and should be logged with as much detail as possible.
@ -202,36 +205,40 @@ static void qtest_check_status(QTestState *s)
void qtest_wait_qemu(QTestState *s)
{
if (s->qemu_pid != -1) {
#ifndef _WIN32
pid_t pid;
uint64_t end;
pid_t pid;
uint64_t end;
/* poll for a while until sending SIGKILL */
end = g_get_monotonic_time() + WAITPID_TIMEOUT * G_TIME_SPAN_SECOND;
/* poll for a while until sending SIGKILL */
end = g_get_monotonic_time() + WAITPID_TIMEOUT * G_TIME_SPAN_SECOND;
do {
pid = waitpid(s->qemu_pid, &s->wstatus, WNOHANG);
if (pid != 0) {
break;
do {
pid = waitpid(s->qemu_pid, &s->wstatus, WNOHANG);
if (pid != 0) {
break;
}
g_usleep(100 * 1000);
} while (g_get_monotonic_time() < end);
if (pid == 0) {
kill(s->qemu_pid, SIGKILL);
pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
}
g_usleep(100 * 1000);
} while (g_get_monotonic_time() < end);
if (pid == 0) {
kill(s->qemu_pid, SIGKILL);
pid = RETRY_ON_EINTR(waitpid(s->qemu_pid, &s->wstatus, 0));
}
assert(pid == s->qemu_pid);
assert(pid == s->qemu_pid);
#else
DWORD ret;
DWORD ret;
ret = WaitForSingleObject((HANDLE)s->qemu_pid, INFINITE);
assert(ret == WAIT_OBJECT_0);
GetExitCodeProcess((HANDLE)s->qemu_pid, &s->exit_code);
CloseHandle((HANDLE)s->qemu_pid);
ret = WaitForSingleObject((HANDLE)s->qemu_pid, INFINITE);
assert(ret == WAIT_OBJECT_0);
GetExitCodeProcess((HANDLE)s->qemu_pid, &s->exit_code);
CloseHandle((HANDLE)s->qemu_pid);
#endif
s->qemu_pid = -1;
qtest_remove_abrt_handler(s);
}
qtest_check_status(s);
}
@ -245,7 +252,6 @@ void qtest_kill_qemu(QTestState *s)
TerminateProcess((HANDLE)s->qemu_pid, s->expected_status);
#endif
qtest_wait_qemu(s);
s->qemu_pid = -1;
return;
}
@ -307,6 +313,11 @@ void qtest_add_abrt_handler(GHookFunc fn, const void *data)
void qtest_remove_abrt_handler(void *data)
{
GHook *hook = g_hook_find_data(&abrt_hooks, TRUE, data);
if (!hook) {
return;
}
g_hook_destroy_link(&abrt_hooks, hook);
/* Uninstall SIGABRT handler on last instance */
@ -360,60 +371,25 @@ static pid_t qtest_create_process(char *cmd)
}
#endif /* _WIN32 */
QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
static QTestState *G_GNUC_PRINTF(1, 2) qtest_spawn_qemu(const char *fmt, ...)
{
QTestState *s;
int sock, qmpsock, i;
gchar *socket_path;
gchar *qmp_socket_path;
gchar *command;
const char *qemu_binary = qtest_qemu_binary();
va_list ap;
QTestState *s = g_new0(QTestState, 1);
const char *trace = g_getenv("QTEST_TRACE");
g_autofree char *tracearg = trace ?
g_strdup_printf("-trace %s ", trace) : g_strdup("");
g_autoptr(GString) command = g_string_new("");
s = g_new(QTestState, 1);
socket_path = g_strdup_printf("%s/qtest-%d.sock",
g_get_tmp_dir(), getpid());
qmp_socket_path = g_strdup_printf("%s/qtest-%d.qmp",
g_get_tmp_dir(), getpid());
/* It's possible that if an earlier test run crashed it might
* have left a stale unix socket lying around. Delete any
* stale old socket to avoid spurious test failures with
* tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1)
*/
unlink(socket_path);
unlink(qmp_socket_path);
socket_init();
sock = init_socket(socket_path);
qmpsock = init_socket(qmp_socket_path);
qtest_client_set_rx_handler(s, qtest_client_socket_recv_line);
qtest_client_set_tx_handler(s, qtest_client_socket_send);
va_start(ap, fmt);
g_string_append_printf(command, CMD_EXEC "%s %s",
qtest_qemu_binary(), tracearg);
g_string_append_vprintf(command, fmt, ap);
va_end(ap);
qtest_add_abrt_handler(kill_qemu_hook_func, s);
command = g_strdup_printf(CMD_EXEC "%s %s"
"-qtest unix:%s "
"-qtest-log %s "
"-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control "
"-display none "
"%s"
" -accel qtest",
qemu_binary, tracearg, socket_path,
getenv("QTEST_LOG") ? DEV_STDERR : DEV_NULL,
qmp_socket_path,
extra_args ?: "");
g_test_message("starting QEMU: %s", command->str);
g_test_message("starting QEMU: %s", command);
s->pending_events = NULL;
s->wstatus = 0;
s->expected_status = 0;
#ifndef _WIN32
s->qemu_pid = fork();
if (s->qemu_pid == 0) {
@ -434,14 +410,56 @@ QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
if (!g_setenv("QEMU_AUDIO_DRV", "none", true)) {
exit(1);
}
execlp("/bin/sh", "sh", "-c", command, NULL);
execlp("/bin/sh", "sh", "-c", command->str, NULL);
exit(1);
}
#else
s->qemu_pid = qtest_create_process(command);
s->qemu_pid = qtest_create_process(command->str);
#endif /* _WIN32 */
g_free(command);
return s;
}
QTestState *qtest_init_without_qmp_handshake(const char *extra_args)
{
QTestState *s;
int sock, qmpsock, i;
gchar *socket_path;
gchar *qmp_socket_path;
socket_path = g_strdup_printf("%s/qtest-%d.sock",
g_get_tmp_dir(), getpid());
qmp_socket_path = g_strdup_printf("%s/qtest-%d.qmp",
g_get_tmp_dir(), getpid());
/*
* It's possible that if an earlier test run crashed it might
* have left a stale unix socket lying around. Delete any
* stale old socket to avoid spurious test failures with
* tests/libqtest.c:70:init_socket: assertion failed (ret != -1): (-1 != -1)
*/
unlink(socket_path);
unlink(qmp_socket_path);
socket_init();
sock = init_socket(socket_path);
qmpsock = init_socket(qmp_socket_path);
s = qtest_spawn_qemu("-qtest unix:%s "
"-qtest-log %s "
"-chardev socket,path=%s,id=char0 "
"-mon chardev=char0,mode=control "
"-display none "
"%s"
" -accel qtest",
socket_path,
getenv("QTEST_LOG") ? DEV_STDERR : DEV_NULL,
qmp_socket_path,
extra_args ?: "");
qtest_client_set_rx_handler(s, qtest_client_socket_recv_line);
qtest_client_set_tx_handler(s, qtest_client_socket_send);
s->fd = socket_accept(sock);
if (s->fd >= 0) {
s->qmp_fd = socket_accept(qmpsock);

6
tests/tcg/i386/Makefile.target
View File

@ -14,7 +14,7 @@ config-cc.mak: Makefile
I386_SRCS=$(notdir $(wildcard $(I386_SRC)/*.c))
ALL_X86_TESTS=$(I386_SRCS:.c=)
SKIP_I386_TESTS=test-i386-ssse3 test-avx test-3dnow test-mmx
X86_64_TESTS:=$(filter test-i386-bmi2 $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
X86_64_TESTS:=$(filter test-i386-adcox test-i386-bmi2 $(SKIP_I386_TESTS), $(ALL_X86_TESTS))
test-i386-sse-exceptions: CFLAGS += -msse4.1 -mfpmath=sse
run-test-i386-sse-exceptions: QEMU_OPTS += -cpu max
@ -28,6 +28,10 @@ test-i386-bmi2: CFLAGS=-O2
run-test-i386-bmi2: QEMU_OPTS += -cpu max
run-plugin-test-i386-bmi2-%: QEMU_OPTS += -cpu max
test-i386-adcox: CFLAGS=-O2
run-test-i386-adcox: QEMU_OPTS += -cpu max
run-plugin-test-i386-adcox-%: QEMU_OPTS += -cpu max
#
# hello-i386 is a barebones app
#

75
tests/tcg/i386/test-i386-adcox.c Normal file
View File

@ -0,0 +1,75 @@
/* See if various BMI2 instructions give expected results */
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
#define CC_C 1
#define CC_O (1 << 11)
#ifdef __x86_64__
#define REG uint64_t
#else
#define REG uint32_t
#endif
void test_adox_adcx(uint32_t in_c, uint32_t in_o, REG adcx_operand, REG adox_operand)
{
REG flags;
REG out_adcx, out_adox;
asm("pushf; pop %0" : "=r"(flags));
flags &= ~(CC_C | CC_O);
flags |= (in_c ? CC_C : 0);
flags |= (in_o ? CC_O : 0);
out_adcx = adcx_operand;
out_adox = adox_operand;
asm("push %0; popf;"
"adox %3, %2;"
"adcx %3, %1;"
"pushf; pop %0"
: "+r" (flags), "+r" (out_adcx), "+r" (out_adox)
: "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox));
assert(out_adcx == in_c + adcx_operand - 1);
assert(out_adox == in_o + adox_operand - 1);
assert(!!(flags & CC_C) == (in_c || adcx_operand));
assert(!!(flags & CC_O) == (in_o || adox_operand));
}
void test_adcx_adox(uint32_t in_c, uint32_t in_o, REG adcx_operand, REG adox_operand)
{
REG flags;
REG out_adcx, out_adox;
asm("pushf; pop %0" : "=r"(flags));
flags &= ~(CC_C | CC_O);
flags |= (in_c ? CC_C : 0);
flags |= (in_o ? CC_O : 0);
out_adcx = adcx_operand;
out_adox = adox_operand;
asm("push %0; popf;"
"adcx %3, %1;"
"adox %3, %2;"
"pushf; pop %0"
: "+r" (flags), "+r" (out_adcx), "+r" (out_adox)
: "r" ((REG)-1), "0" (flags), "1" (out_adcx), "2" (out_adox));
assert(out_adcx == in_c + adcx_operand - 1);
assert(out_adox == in_o + adox_operand - 1);
assert(!!(flags & CC_C) == (in_c || adcx_operand));
assert(!!(flags & CC_O) == (in_o || adox_operand));
}
int main(int argc, char *argv[]) {
/* try all combinations of input CF, input OF, CF from op1+op2, OF from op2+op1 */
int i;
for (i = 0; i <= 15; i++) {
printf("%d\n", i);
test_adcx_adox(!!(i & 1), !!(i & 2), !!(i & 4), !!(i & 8));
test_adox_adcx(!!(i & 1), !!(i & 2), !!(i & 4), !!(i & 8));
}
return 0;
}

194
tests/tcg/i386/test-i386-bmi2.c
View File

@ -3,34 +3,40 @@
#include <stdint.h>
#include <stdio.h>
#ifdef __x86_64
typedef uint64_t reg_t;
#else
typedef uint32_t reg_t;
#endif
#define insn1q(name, arg0) \
static inline uint64_t name##q(uint64_t arg0) \
static inline reg_t name##q(reg_t arg0) \
{ \
uint64_t result64; \
reg_t result64; \
asm volatile (#name "q %1, %0" : "=r"(result64) : "rm"(arg0)); \
return result64; \
}
#define insn1l(name, arg0) \
static inline uint32_t name##l(uint32_t arg0) \
static inline reg_t name##l(reg_t arg0) \
{ \
uint32_t result32; \
reg_t result32; \
asm volatile (#name "l %k1, %k0" : "=r"(result32) : "rm"(arg0)); \
return result32; \
}
#define insn2q(name, arg0, c0, arg1, c1) \
static inline uint64_t name##q(uint64_t arg0, uint64_t arg1) \
static inline reg_t name##q(reg_t arg0, reg_t arg1) \
{ \
uint64_t result64; \
reg_t result64; \
asm volatile (#name "q %2, %1, %0" : "=r"(result64) : c0(arg0), c1(arg1)); \
return result64; \
}
#define insn2l(name, arg0, c0, arg1, c1) \
static inline uint32_t name##l(uint32_t arg0, uint32_t arg1) \
static inline reg_t name##l(reg_t arg0, reg_t arg1) \
{ \
uint32_t result32; \
reg_t result32; \
asm volatile (#name "l %k2, %k1, %k0" : "=r"(result32) : c0(arg0), c1(arg1)); \
return result32; \
}
@ -65,130 +71,140 @@ insn1l(blsr, src)
int main(int argc, char *argv[]) {
uint64_t ehlo = 0x202020204f4c4845ull;
uint64_t mask = 0xa080800302020001ull;
uint32_t result32;
reg_t result;
#ifdef __x86_64
uint64_t result64;
/* 64 bits */
result64 = andnq(mask, ehlo);
assert(result64 == 0x002020204d4c4844);
result = andnq(mask, ehlo);
assert(result == 0x002020204d4c4844);
result64 = pextq(ehlo, mask);
assert(result64 == 133);
result = pextq(ehlo, mask);
assert(result == 133);
result64 = pdepq(result64, mask);
assert(result64 == (ehlo & mask));
result = pdepq(result, mask);
assert(result == (ehlo & mask));
result64 = pextq(-1ull, mask);
assert(result64 == 511); /* mask has 9 bits set */
result = pextq(-1ull, mask);
assert(result == 511); /* mask has 9 bits set */
result64 = pdepq(-1ull, mask);
assert(result64 == mask);
result = pdepq(-1ull, mask);
assert(result == mask);
result64 = bextrq(mask, 0x3f00);
assert(result64 == (mask & ~INT64_MIN));
result = bextrq(mask, 0x3f00);
assert(result == (mask & ~INT64_MIN));
result64 = bextrq(mask, 0x1038);
assert(result64 == 0xa0);
result = bextrq(mask, 0x1038);
assert(result == 0xa0);
result64 = bextrq(mask, 0x10f8);
assert(result64 == 0);
result = bextrq(mask, 0x10f8);
assert(result == 0);
result64 = blsiq(0x30);
assert(result64 == 0x10);
result = bextrq(0xfedcba9876543210ull, 0x7f00);
assert(result == 0xfedcba9876543210ull);
result64 = blsiq(0x30ull << 32);
assert(result64 == 0x10ull << 32);
result = blsiq(0x30);
assert(result == 0x10);
result64 = blsmskq(0x30);
assert(result64 == 0x1f);
result = blsiq(0x30ull << 32);
assert(result == 0x10ull << 32);
result64 = blsrq(0x30);
assert(result64 == 0x20);
result = blsmskq(0x30);
assert(result == 0x1f);
result64 = blsrq(0x30ull << 32);
assert(result64 == 0x20ull << 32);
result = blsrq(0x30);
assert(result == 0x20);
result64 = bzhiq(mask, 0x3f);
assert(result64 == (mask & ~INT64_MIN));
result = blsrq(0x30ull << 32);
assert(result == 0x20ull << 32);
result64 = bzhiq(mask, 0x1f);
assert(result64 == (mask & ~(-1 << 30)));
result = bzhiq(mask, 0x3f);
assert(result == (mask & ~INT64_MIN));
result64 = rorxq(0x2132435465768798, 8);
assert(result64 == 0x9821324354657687);
result = bzhiq(mask, 0x1f);
assert(result == (mask & ~(-1 << 30)));
result64 = sarxq(0xffeeddccbbaa9988, 8);
assert(result64 == 0xffffeeddccbbaa99);
result = rorxq(0x2132435465768798, 8);
assert(result == 0x9821324354657687);
result64 = sarxq(0x77eeddccbbaa9988, 8 | 64);
assert(result64 == 0x0077eeddccbbaa99);
result = sarxq(0xffeeddccbbaa9988, 8);
assert(result == 0xffffeeddccbbaa99);
result64 = shrxq(0xffeeddccbbaa9988, 8);
assert(result64 == 0x00ffeeddccbbaa99);
result = sarxq(0x77eeddccbbaa9988, 8 | 64);
assert(result == 0x0077eeddccbbaa99);
result64 = shrxq(0x77eeddccbbaa9988, 8 | 192);
assert(result64 == 0x0077eeddccbbaa99);
result = shrxq(0xffeeddccbbaa9988, 8);
assert(result == 0x00ffeeddccbbaa99);
result64 = shlxq(0xffeeddccbbaa9988, 8);
assert(result64 == 0xeeddccbbaa998800);
result = shrxq(0x77eeddccbbaa9988, 8 | 192);
assert(result == 0x0077eeddccbbaa99);
result = shlxq(0xffeeddccbbaa9988, 8);
assert(result == 0xeeddccbbaa998800);
#endif
/* 32 bits */
result32 = andnl(mask, ehlo);
assert(result32 == 0x04d4c4844);
result = andnl(mask, ehlo);
assert(result == 0x04d4c4844);
result32 = pextl((uint32_t) ehlo, mask);
assert(result32 == 5);
result = pextl((uint32_t) ehlo, mask);
assert(result == 5);
result32 = pdepl(result32, mask);
assert(result32 == (uint32_t)(ehlo & mask));
result = pdepl(result, mask);
assert(result == (uint32_t)(ehlo & mask));
result32 = pextl(-1u, mask);
assert(result32 == 7); /* mask has 3 bits set */
result = pextl(-1u, mask);
assert(result == 7); /* mask has 3 bits set */
result32 = pdepl(-1u, mask);
assert(result32 == (uint32_t)mask);
result = pdepl(-1u, mask);
assert(result == (uint32_t)mask);
result32 = bextrl(mask, 0x1f00);
assert(result32 == (mask & ~INT32_MIN));
result = bextrl(mask, 0x1f00);
assert(result == (mask & ~INT32_MIN));
result32 = bextrl(ehlo, 0x1018);
assert(result32 == 0x4f);
result = bextrl(ehlo, 0x1018);
assert(result == 0x4f);
result32 = bextrl(mask, 0x1038);
assert(result32 == 0);
result = bextrl(mask, 0x1038);
assert(result == 0);
result32 = blsil(0xffff);
assert(result32 == 1);
result = bextrl((reg_t)0x8f635a775ad3b9b4ull, 0x3018);
assert(result == 0x5a);
result32 = blsmskl(0x300);
assert(result32 == 0x1ff);
result = bextrl((reg_t)0xfedcba9876543210ull, 0x7f00);
assert(result == 0x76543210u);
result32 = blsrl(0xffc);
assert(result32 == 0xff8);
result = bextrl(-1, 0);
assert(result == 0);
result32 = bzhil(mask, 0xf);
assert(result32 == 1);
result = blsil(0xffff);
assert(result == 1);
result32 = rorxl(0x65768798, 8);
assert(result32 == 0x98657687);
result = blsmskl(0x300);
assert(result == 0x1ff);
result32 = sarxl(0xffeeddcc, 8);
assert(result32 == 0xffffeedd);
result = blsrl(0xffc);
assert(result == 0xff8);
result32 = sarxl(0x77eeddcc, 8 | 32);
assert(result32 == 0x0077eedd);
result = bzhil(mask, 0xf);
assert(result == 1);
result32 = shrxl(0xffeeddcc, 8);
assert(result32 == 0x00ffeedd);
result = rorxl(0x65768798, 8);
assert(result == 0x98657687);
result32 = shrxl(0x77eeddcc, 8 | 128);
assert(result32 == 0x0077eedd);
result = sarxl(0xffeeddcc, 8);
assert(result == 0xffffeedd);
result32 = shlxl(0xffeeddcc, 8);
assert(result32 == 0xeeddcc00);
result = sarxl(0x77eeddcc, 8 | 32);
assert(result == 0x0077eedd);
result = shrxl(0xffeeddcc, 8);
assert(result == 0x00ffeedd);
result = shrxl(0x77eeddcc, 8 | 128);
assert(result == 0x0077eedd);
result = shlxl(0xffeeddcc, 8);
assert(result == 0xeeddcc00);
return 0;
}