Revision: 9753
Author: [email protected]
Date: Mon Oct 24 05:12:21 2011
Log: Moved random generator state to global context.
Change Random to take global context, not isolate.
BUG=v8:864
Review URL: http://codereview.chromium.org/8162014
http://code.google.com/p/v8/source/detail?r=9753
Modified:
/branches/bleeding_edge/src/api.cc
/branches/bleeding_edge/src/arm/full-codegen-arm.cc
/branches/bleeding_edge/src/bootstrapper.cc
/branches/bleeding_edge/src/contexts.h
/branches/bleeding_edge/src/globals.h
/branches/bleeding_edge/src/ia32/full-codegen-ia32.cc
/branches/bleeding_edge/src/isolate.h
/branches/bleeding_edge/src/mips/full-codegen-mips.cc
/branches/bleeding_edge/src/objects.cc
/branches/bleeding_edge/src/v8.cc
/branches/bleeding_edge/src/v8.h
/branches/bleeding_edge/src/x64/full-codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/api.cc Wed Oct 19 05:04:16 2011
+++ /branches/bleeding_edge/src/api.cc Mon Oct 24 05:12:21 2011
@@ -4105,8 +4105,9 @@
}
// Leave V8.
- if (env.is_null())
+ if (env.is_null()) {
return Persistent<Context>();
+ }
return Persistent<Context>(Utils::ToLocal(env));
}
=======================================
--- /branches/bleeding_edge/src/arm/full-codegen-arm.cc Mon Oct 24 00:47:22
2011
+++ /branches/bleeding_edge/src/arm/full-codegen-arm.cc Mon Oct 24 05:12:21
2011
@@ -2828,7 +2828,8 @@
// ( 1.(20 0s)(32 random bits) x 2^20 ) - (1.0 x 2^20)).
if (CpuFeatures::IsSupported(VFP3)) {
__ PrepareCallCFunction(1, r0);
- __ mov(r0, Operand(ExternalReference::isolate_address()));
+ __ ldr(r0, ContextOperand(context_register(), Context::GLOBAL_INDEX));
+ __ ldr(r0, FieldMemOperand(r0, GlobalObject::kGlobalContextOffset));
__ CallCFunction(ExternalReference::random_uint32_function(isolate()),
1);
CpuFeatures::Scope scope(VFP3);
@@ -2848,8 +2849,9 @@
__ mov(r0, r4);
} else {
__ PrepareCallCFunction(2, r0);
+ __ ldr(r1, ContextOperand(context_register(), Context::GLOBAL_INDEX));
__ mov(r0, Operand(r4));
- __ mov(r1, Operand(ExternalReference::isolate_address()));
+ __ ldr(r1, FieldMemOperand(r1, GlobalObject::kGlobalContextOffset));
__ CallCFunction(
ExternalReference::fill_heap_number_with_random_function(isolate()), 2);
}
=======================================
--- /branches/bleeding_edge/src/bootstrapper.cc Fri Oct 21 03:32:38 2011
+++ /branches/bleeding_edge/src/bootstrapper.cc Mon Oct 24 05:12:21 2011
@@ -1227,6 +1227,14 @@
// Initialize the data slot.
global_context()->set_data(heap->undefined_value());
+
+ {
+ // Initialize the random seed slot.
+ Handle<ByteArray> zeroed_byte_array(
+ factory->NewByteArray(kRandomStateSize));
+ global_context()->set_random_seed(*zeroed_byte_array);
+ memset(zeroed_byte_array->GetDataStartAddress(), 0, kRandomStateSize);
+ }
}
=======================================
--- /branches/bleeding_edge/src/contexts.h Fri Oct 21 03:26:59 2011
+++ /branches/bleeding_edge/src/contexts.h Mon Oct 24 05:12:21 2011
@@ -138,7 +138,8 @@
to_complete_property_descriptor) \
V(DERIVED_HAS_TRAP_INDEX, JSFunction, derived_has_trap) \
V(DERIVED_GET_TRAP_INDEX, JSFunction, derived_get_trap) \
- V(DERIVED_SET_TRAP_INDEX, JSFunction, derived_set_trap)
+ V(DERIVED_SET_TRAP_INDEX, JSFunction, derived_set_trap) \
+ V(RANDOM_SEED_INDEX, ByteArray, random_seed)
// JSFunctions are pairs (context, function code), sometimes also called
// closures. A Context object is used to represent function contexts and
@@ -259,6 +260,7 @@
DERIVED_HAS_TRAP_INDEX,
DERIVED_GET_TRAP_INDEX,
DERIVED_SET_TRAP_INDEX,
+ RANDOM_SEED_INDEX,
// Properties from here are treated as weak references by the full GC.
// Scavenge treats them as strong references.
=======================================
--- /branches/bleeding_edge/src/globals.h Mon Sep 26 05:44:36 2011
+++ /branches/bleeding_edge/src/globals.h Mon Oct 24 05:12:21 2011
@@ -230,6 +230,9 @@
const int kDoubleSizeLog2 = 3;
+// Size of the state of a the random number generator.
+const int kRandomStateSize = 2 * kIntSize;
+
#if V8_HOST_ARCH_64_BIT
const int kPointerSizeLog2 = 3;
const intptr_t kIntptrSignBit = V8_INT64_C(0x8000000000000000);
=======================================
--- /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Mon Oct 24
00:47:22 2011
+++ /branches/bleeding_edge/src/ia32/full-codegen-ia32.cc Mon Oct 24
05:12:21 2011
@@ -2832,9 +2832,10 @@
__ bind(&heapnumber_allocated);
__ PrepareCallCFunction(1, ebx);
- __ mov(Operand(esp, 0), Immediate(ExternalReference::isolate_address()));
- __ CallCFunction(ExternalReference::random_uint32_function(isolate()),
- 1);
+ __ mov(eax, ContextOperand(context_register(), Context::GLOBAL_INDEX));
+ __ mov(eax, FieldOperand(eax, GlobalObject::kGlobalContextOffset));
+ __ mov(Operand(esp, 0), eax);
+ __ CallCFunction(ExternalReference::random_uint32_function(isolate()),
1);
// Convert 32 random bits in eax to 0.(32 random bits) in a double
// by computing:
=======================================
--- /branches/bleeding_edge/src/isolate.h Tue Oct 18 04:18:55 2011
+++ /branches/bleeding_edge/src/isolate.h Mon Oct 24 05:12:21 2011
@@ -314,7 +314,6 @@
V(int, bad_char_shift_table,
kUC16AlphabetSize) \
V(int, good_suffix_shift_table, (kBMMaxShift +
1)) \
V(int, suffix_table, (kBMMaxShift +
1)) \
- V(uint32_t, random_seed,
2) \
V(uint32_t, private_random_seed,
2) \
ISOLATE_INIT_DEBUG_ARRAY_LIST(V)
=======================================
--- /branches/bleeding_edge/src/mips/full-codegen-mips.cc Fri Oct 21
08:15:47 2011
+++ /branches/bleeding_edge/src/mips/full-codegen-mips.cc Mon Oct 24
05:12:21 2011
@@ -2850,7 +2850,8 @@
// ( 1.(20 0s)(32 random bits) x 2^20 ) - (1.0 x 2^20)).
if (CpuFeatures::IsSupported(FPU)) {
__ PrepareCallCFunction(1, a0);
- __ li(a0, Operand(ExternalReference::isolate_address()));
+ __ lw(a0, ContextOperand(cp, Context::GLOBAL_INDEX));
+ __ lw(a0, FieldOperand(a0, GlobalObject::kGlobalContextOffset));
__ CallCFunction(ExternalReference::random_uint32_function(isolate()),
1);
@@ -2868,7 +2869,8 @@
} else {
__ PrepareCallCFunction(2, a0);
__ mov(a0, s0);
- __ li(a1, Operand(ExternalReference::isolate_address()));
+ __ lw(a1, ContextOperand(cp, Context::GLOBAL_INDEX));
+ __ lw(a1, FieldOperand(a1, GlobalObject::kGlobalContextOffset));
__ CallCFunction(
ExternalReference::fill_heap_number_with_random_function(isolate()), 2);
}
=======================================
--- /branches/bleeding_edge/src/objects.cc Mon Oct 24 00:47:22 2011
+++ /branches/bleeding_edge/src/objects.cc Mon Oct 24 05:12:21 2011
@@ -3517,7 +3517,7 @@
do {
// Generate a random 32-bit hash value but limit range to fit
// within a smi.
- hash_value = V8::Random(isolate) & Smi::kMaxValue;
+ hash_value = V8::RandomPrivate(isolate) & Smi::kMaxValue;
attempts++;
} while (hash_value == 0 && attempts < 30);
hash_value = hash_value != 0 ? hash_value : 1; // never return 0
=======================================
--- /branches/bleeding_edge/src/v8.cc Wed Oct 12 05:23:06 2011
+++ /branches/bleeding_edge/src/v8.cc Mon Oct 24 05:12:21 2011
@@ -150,9 +150,10 @@
// Used by JavaScript APIs
-uint32_t V8::Random(Isolate* isolate) {
- ASSERT(isolate == Isolate::Current());
- return random_base(isolate->random_seed());
+uint32_t V8::Random(Context* context) {
+ ASSERT(context->IsGlobalContext());
+ ByteArray* seed = context->random_seed();
+ return
random_base(reinterpret_cast<uint32_t*>(seed->GetDataStartAddress()));
}
@@ -182,8 +183,9 @@
} double_int_union;
-Object* V8::FillHeapNumberWithRandom(Object* heap_number, Isolate*
isolate) {
- uint64_t random_bits = Random(isolate);
+Object* V8::FillHeapNumberWithRandom(Object* heap_number,
+ Context* context) {
+ uint64_t random_bits = Random(context);
// Make a double* from address (heap_number + sizeof(double)).
double_int_union* r = reinterpret_cast<double_int_union*>(
reinterpret_cast<char*>(heap_number) +
=======================================
--- /branches/bleeding_edge/src/v8.h Mon Oct 3 04:13:20 2011
+++ /branches/bleeding_edge/src/v8.h Mon Oct 24 05:12:21 2011
@@ -96,14 +96,14 @@
// generation.
static void SetEntropySource(EntropySource source);
// Random number generation support. Not cryptographically safe.
- static uint32_t Random(Isolate* isolate);
+ static uint32_t Random(Context* context);
// We use random numbers internally in memory allocation and in the
// compilers for security. In order to prevent information leaks we
// use a separate random state for internal random number
// generation.
static uint32_t RandomPrivate(Isolate* isolate);
static Object* FillHeapNumberWithRandom(Object* heap_number,
- Isolate* isolate);
+ Context* context);
// Idle notification directly from the API.
static bool IdleNotification();
=======================================
--- /branches/bleeding_edge/src/x64/full-codegen-x64.cc Mon Oct 24 00:47:22
2011
+++ /branches/bleeding_edge/src/x64/full-codegen-x64.cc Mon Oct 24 05:12:21
2011
@@ -2706,9 +2706,12 @@
// The fresh HeapNumber is in rbx, which is callee-save on both x64 ABIs.
__ PrepareCallCFunction(1);
#ifdef _WIN64
- __ LoadAddress(rcx, ExternalReference::isolate_address());
+ __ movq(rcx, ContextOperand(context_register(), Context::GLOBAL_INDEX));
+ __ movq(rcx, FieldOperand(rcx, GlobalObject::kGlobalContextOffset));
+
#else
- __ LoadAddress(rdi, ExternalReference::isolate_address());
+ __ movq(rdi, ContextOperand(context_register(), Context::GLOBAL_INDEX));
+ __ movq(rdi, FieldOperand(rdi, GlobalObject::kGlobalContextOffset));
#endif
__ CallCFunction(ExternalReference::random_uint32_function(isolate()),
1);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
