Andreas Sandberg has submitted this change and it was merged. (
https://gem5-review.googlesource.com/c/public/gem5/+/13104 )
Change subject: arch: Fix unserialization of VectorReg value
......................................................................
arch: Fix unserialization of VectorReg value
Change-Id: Iba01ae60e10703877eae299ba924fa1f04a4a387
Signed-off-by: Giacomo Gabrielli <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/13104
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
---
M src/arch/generic/vec_reg.hh
1 file changed, 9 insertions(+), 6 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
diff --git a/src/arch/generic/vec_reg.hh b/src/arch/generic/vec_reg.hh
index b68a588..7145af4 100644
--- a/src/arch/generic/vec_reg.hh
+++ b/src/arch/generic/vec_reg.hh
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2015-2016 ARM Limited
+ * Copyright (c) 2015-2016, 2018 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -635,11 +635,14 @@
inline bool
to_number(const std::string& value, VecRegContainer<Sz>& v)
{
- int i = 0;
- while (i < Sz) {
- std::string byte = value.substr(i<<1, 2);
- v.template raw_ptr<uint8_t>()[i] = stoul(byte, 0, 16);
- i++;
+ fatal_if(value.size() > 2 * VecRegContainer<Sz>::SIZE,
+ "Vector register value overflow at unserialize");
+
+ for (int i = 0; i < VecRegContainer<Sz>::SIZE; i++) {
+ uint8_t b = 0;
+ if (2 * i < value.size())
+ b = stoul(value.substr(i * 2, 2), nullptr, 16);
+ v.template raw_ptr<uint8_t>()[i] = b;
}
return true;
}
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/13104
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: Iba01ae60e10703877eae299ba924fa1f04a4a387
Gerrit-Change-Number: 13104
Gerrit-PatchSet: 6
Gerrit-Owner: Giacomo Gabrielli <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabor Dozsa <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
