3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 22:16:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix collision between 49c03db12965 and 56503fef865d.

Browse Source 
R=rsesek@chromium.org

Review URL: https://codereview.chromium.org/628403002
This commit is contained in:
Mark Mentovai 2014-10-06 19:02:57 -04:00
parent 49c03db129
commit d0294f3bb8
2 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
snapshot/cpu_context_mac.cc
View File

@ -227,16 +227,16 @@ void InitializeCPUContextX86_64Thread(
void InitializeCPUContextX86_64Float( void InitializeCPUContextX86_64Float(
CPUContextX86_64* context, const x86_float_state64_t* x86_float_state64) { CPUContextX86_64* context, const x86_float_state64_t* x86_float_state64) {
// This relies on both x86_float_state64_t and context->fxsave64 having // This relies on both x86_float_state64_t and context->fxsave having
// identical (fxsave64) layout. // identical (fxsave) layout.
static_assert(offsetof(x86_float_state64_t, __fpu_reserved1) - static_assert(offsetof(x86_float_state64_t, __fpu_reserved1) -
offsetof(x86_float_state64_t, __fpu_fcw) == offsetof(x86_float_state64_t, __fpu_fcw) ==
sizeof(context->fxsave64), sizeof(context->fxsave),
"types must be equivalent"); "types must be equivalent");
memcpy(&context->fxsave64, memcpy(&context->fxsave,
&x86_float_state64->__fpu_fcw, &x86_float_state64->__fpu_fcw,
sizeof(context->fxsave64)); sizeof(context->fxsave));
} }
void InitializeCPUContextX86_64Debug( void InitializeCPUContextX86_64Debug(

18
snapshot/cpu_context_mac_test.cc
View File

@ -239,7 +239,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -265,7 +265,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(13u, cpu_context_x86_64.rax); EXPECT_EQ(13u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -283,7 +283,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(14u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(14u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -301,7 +301,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(15u, cpu_context_x86_64.dr0); EXPECT_EQ(15u, cpu_context_x86_64.dr0);
} }
@ -328,7 +328,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(16u, cpu_context_x86_64.rax); EXPECT_EQ(16u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -348,7 +348,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(17u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(17u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -368,7 +368,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(18u, cpu_context_x86_64.dr0); EXPECT_EQ(18u, cpu_context_x86_64.dr0);
} }
@ -390,7 +390,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
@ -409,7 +409,7 @@ TEST(CPUContextMac, InitializeContextX86_64) {
&x86_float_state64, &x86_float_state64,
&x86_debug_state64); &x86_debug_state64);
EXPECT_EQ(10u, cpu_context_x86_64.rax); EXPECT_EQ(10u, cpu_context_x86_64.rax);
EXPECT_EQ(11u, cpu_context_x86_64.fxsave64.ftw); EXPECT_EQ(11u, cpu_context_x86_64.fxsave.ftw);
EXPECT_EQ(12u, cpu_context_x86_64.dr0); EXPECT_EQ(12u, cpu_context_x86_64.dr0);
} }
} }