derek/gem5
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

dev-arm: Check for gem5 extensions in GicV2

Browse Source 
Using GicV2 without setting the gem5_extensions parameter in a
config  with more than 8 is not allowed to prevent overflow of
the 8-bit mask.

Change-Id: I780c6985e8f44ed780b4f74f9a27805124e23a7b
Signed-off-by: Tiago Mück <tiago.muck@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/19288
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>
This commit is contained in:
Tiago Muck
2019-05-16 16:25:17 -05:00
committed by Tiago Mück
parent 36e59917a7
commit 1c047f8b92
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/dev/arm/gic_v2.hh
View File

@@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2013, 2015-2018 ARM Limited
* Copyright (c) 2010, 2013, 2015-2019 ARM Limited
* All rights reserved
*
* The license below extends only to copyright in the software and shall
@@ -309,8 +309,11 @@ class GicV2 : public BaseGic, public BaseGicRegisters
if (gem5ExtensionsEnabled) {
ctx_mask = ctx;
} else {
// convert the CPU id number into a bit mask
ctx_mask = power(2, ctx);
fatal_if(ctx >= 8,
"%s requires the gem5_extensions parameter to support "
"more than 8 cores\n", name());
// convert the CPU id number into a bit mask
ctx_mask = 1 << ctx;
}
return ctx_mask;
} else {