Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 /* | 1 /* |
| 2 * Copyright (C) 2013 Google Inc. All rights reserved. | 2 * Copyright (C) 2013 Google Inc. All rights reserved. |
| 3 * | 3 * |
| 4 * Redistribution and use in source and binary forms, with or without | 4 * Redistribution and use in source and binary forms, with or without |
| 5 * modification, are permitted provided that the following conditions are | 5 * modification, are permitted provided that the following conditions are |
| 6 * met: | 6 * met: |
| 7 * | 7 * |
| 8 * * Redistributions of source code must retain the above copyright | 8 * * Redistributions of source code must retain the above copyright |
| 9 * notice, this list of conditions and the following disclaimer. | 9 * notice, this list of conditions and the following disclaimer. |
| 10 * * Redistributions in binary form must reproduce the above | 10 * * Redistributions in binary form must reproduce the above |
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 55 #else | 55 #else |
| 56 #error Unknown OS | 56 #error Unknown OS |
| 57 #endif // OS(POSIX) | 57 #endif // OS(POSIX) |
| 58 | 58 |
| 59 namespace WTF { | 59 namespace WTF { |
| 60 | 60 |
| 61 #if OS(WIN) | 61 #if OS(WIN) |
| 62 | 62 |
| 63 static bool shouldUseAddressHint() | 63 static bool shouldUseAddressHint() |
| 64 { | 64 { |
| 65 #if CPU(32BIT) | 65 #if !CPU(64BIT) |
|
Chris Evans
2014/11/14 01:48:16
I kind of like having the symmetry of both CPU(32B
| |
| 66 // When running 32-bit processes under 32-bit Windows, the userspace is | 66 // When running 32-bit processes under 32-bit Windows, the userspace is |
| 67 // limited to 2 GB, and we risk fragmenting it badly if we allow further | 67 // limited to 2 GB, and we risk fragmenting it badly if we allow further |
| 68 // randomization via our address hint. On the other hand, if the process | 68 // randomization via our address hint. On the other hand, if the process |
| 69 // is running under WOW64, then it has at least 3 GB available (and likely | 69 // is running under WOW64, then it has at least 3 GB available (and likely |
| 70 // 4 GB depending upon the OS version), and we want use the additional | 70 // 4 GB depending upon the OS version), and we want use the additional |
| 71 // randomness. | 71 // randomness. |
| 72 // TODO(tsepez): presently disabled due to IsWow64Process() compatibility. | 72 static BOOL bIsWow64 = -1; |
| 73 if (bIsWow64 == -1) { | |
| 74 IsWow64Process(GetCurrentProcess(), &bIsWow64); | |
| 75 } | |
| 76 return !!bIsWow64; | |
| 77 #else // !CPU(64BIT) | |
| 73 return true; | 78 return true; |
| 74 #else // CPU(32BIT) | 79 #endif // !CPU(64BIT) |
| 75 return true; | |
| 76 #endif // CPU(32BIT) | |
| 77 } | 80 } |
| 78 | 81 |
| 79 #endif // OS(WIN) | 82 #endif // OS(WIN) |
| 80 | 83 |
| 81 // This simple internal function wraps the OS-specific page allocation call so | 84 // This simple internal function wraps the OS-specific page allocation call so |
| 82 // that it behaves consistently: the address is a hint and if it cannot be used, | 85 // that it behaves consistently: the address is a hint and if it cannot be used, |
| 83 // the allocation will be placed elsewhere. | 86 // the allocation will be placed elsewhere. |
| 84 static void* systemAllocPages(void* addr, size_t len) | 87 static void* systemAllocPages(void* addr, size_t len) |
| 85 { | 88 { |
| 86 ASSERT(!(len & kPageAllocationGranularityOffsetMask)); | 89 ASSERT(!(len & kPageAllocationGranularityOffsetMask)); |
| (...skipping 150 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 237 ASSERT(!(len & kSystemPageOffsetMask)); | 240 ASSERT(!(len & kSystemPageOffsetMask)); |
| 238 #if OS(POSIX) | 241 #if OS(POSIX) |
| 239 (void) addr; | 242 (void) addr; |
| 240 #else | 243 #else |
| 241 setSystemPagesAccessible(addr, len); | 244 setSystemPagesAccessible(addr, len); |
| 242 #endif | 245 #endif |
| 243 } | 246 } |
| 244 | 247 |
| 245 } // namespace WTF | 248 } // namespace WTF |
| 246 | 249 |
| OLD | NEW |