Ciro Santilli has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/21605 )
Change subject: sim-se: fix futexFunc TGT_FUTEX_WAIT always selects bitset
......................................................................
sim-se: fix futexFunc TGT_FUTEX_WAIT always selects bitset
Change-Id: I3e2bd1dd34d7cc00b2685547ab74b56bd8126128
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/21605
Reviewed-by: Brandon Potter <brandon.pot...@amd.com>
Maintainer: Brandon Potter <brandon.pot...@amd.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M src/sim/syscall_emul.hh
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Brandon Potter: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/sim/syscall_emul.hh b/src/sim/syscall_emul.hh
index 91ddb25..66ca28f 100644
--- a/src/sim/syscall_emul.hh
+++ b/src/sim/syscall_emul.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2012-2013, 2015 ARM Limited
+ * Copyright (c) 2012-2013, 2015, 2019 ARM Limited
* Copyright (c) 2015 Advanced Micro Devices, Inc.
* All rights reserved
*
@@ -368,7 +368,7 @@
if (val != mem_val)
return -OS::TGT_EWOULDBLOCK;
- if (OS::TGT_FUTEX_WAIT) {
+ if (OS::TGT_FUTEX_WAIT == op) {
futex_map.suspend(uaddr, process->tgid(), tc);
} else {
futex_map.suspend_bitset(uaddr, process->tgid(), tc, val3);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/21605
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: master
Gerrit-Change-Id: I3e2bd1dd34d7cc00b2685547ab74b56bd8126128
Gerrit-Change-Number: 21605
Gerrit-PatchSet: 2
Gerrit-Owner: Ciro Santilli <ciro.santi...@arm.com>
Gerrit-Reviewer: Andreas Sandberg <andreas.sandb...@arm.com>
Gerrit-Reviewer: Brandon Potter <brandon.pot...@amd.com>
Gerrit-Reviewer: Ciro Santilli <ciro.santi...@arm.com>
Gerrit-Reviewer: Giacomo Travaglini <giacomo.travagl...@arm.com>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
gem5-dev@gem5.org
http://m5sim.org/mailman/listinfo/gem5-dev
