diff options
| author | Dave Allison <dallison@google.com> | 2014-07-25 16:15:27 -0700 |
|---|---|---|
| committer | Dave Allison <dallison@google.com> | 2014-08-13 09:01:41 -0700 |
| commit | 648d7112609dd19c38131b3e71c37bcbbd19d11e (patch) | |
| tree | 54062831327c660acb309e877e8d8df9ba0c2d5d /runtime/instruction_set.cc | |
| parent | 99c251bbd225dd97d0deece29559a430b12a0b66 (diff) | |
| download | android_art-648d7112609dd19c38131b3e71c37bcbbd19d11e.tar.gz android_art-648d7112609dd19c38131b3e71c37bcbbd19d11e.tar.bz2 android_art-648d7112609dd19c38131b3e71c37bcbbd19d11e.zip | |
Reduce stack usage for overflow checks
This reduces the stack space reserved for overflow checks to 12K, split
into an 8K gap and a 4K protected region. GC needs over 8K when running
in a stack overflow situation.
Also prevents signal runaway by detecting a signal inside code that
resulted from a signal handler invokation. And adds a max signal count to
the SignalTest to prevent it running forever.
Also reduces the number of iterations for the InterfaceTest as this was
taking (almost) forever with the --trace option on run-test.
Bug: 15435566
Change-Id: Id4fd46f22d52d42a9eb431ca07948673e8fda694
Diffstat (limited to 'runtime/instruction_set.cc')
| -rw-r--r-- | runtime/instruction_set.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/runtime/instruction_set.cc b/runtime/instruction_set.cc index d7e358ce96..d8a38f42d7 100644 --- a/runtime/instruction_set.cc +++ b/runtime/instruction_set.cc @@ -87,11 +87,10 @@ size_t GetInstructionSetAlignment(InstructionSet isa) { static constexpr size_t kDefaultStackOverflowReservedBytes = 16 * KB; static constexpr size_t kMipsStackOverflowReservedBytes = kDefaultStackOverflowReservedBytes; -// TODO: Lower once implicit stack-overflow checks can work with less than 16K. -static constexpr size_t kArmStackOverflowReservedBytes = (kIsDebugBuild ? 16 : 16) * KB; -static constexpr size_t kArm64StackOverflowReservedBytes = (kIsDebugBuild ? 16 : 16) * KB; -static constexpr size_t kX86StackOverflowReservedBytes = (kIsDebugBuild ? 16 : 16) * KB; -static constexpr size_t kX86_64StackOverflowReservedBytes = (kIsDebugBuild ? 16 : 16) * KB; +static constexpr size_t kArmStackOverflowReservedBytes = 8 * KB; +static constexpr size_t kArm64StackOverflowReservedBytes = 8 * KB; +static constexpr size_t kX86StackOverflowReservedBytes = 8 * KB; +static constexpr size_t kX86_64StackOverflowReservedBytes = 8 * KB; size_t GetStackOverflowReservedBytes(InstructionSet isa) { switch (isa) { |