| commit | 009320a2b4f4a3d5d87974763ee2d2acdacf591c | [log] [tgz] |
|---|---|---|
| author | swift-ci <swift-ci@users.noreply.github.com> | Tue Nov 14 19:38:59 2017 -0800 |
| committer | swift-ci <swift-ci@users.noreply.github.com> | Tue Nov 14 19:38:59 2017 -0800 |
| tree | 6dce993120a06b136c90cbeb9cca1f858508f666 | |
| parent | c366344a1e8ad5ccf19d3d921a6057efaeccf64a [diff] | |
| parent | 01fcf57df0e1a5617825a955a3832afa9e27c354 [diff] |
Merge remote-tracking branch 'origin/swift-4.1-branch' into stable
diff --git a/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp b/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp index 66451e6..5df1c66 100644 --- a/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp +++ b/source/Plugins/ObjectFile/Mach-O/ObjectFileMachO.cpp
@@ -687,7 +687,7 @@ case FPURegSet: { uint8_t *fpu_reg_buf = (uint8_t *)&fpu.v[0]; const int fpu_reg_buf_size = sizeof(fpu); - if (fpu_reg_buf_size == count && + if (fpu_reg_buf_size == count * sizeof(uint32_t) && data.ExtractBytes(offset, fpu_reg_buf_size, eByteOrderLittle, fpu_reg_buf) == fpu_reg_buf_size) { SetError(FPURegSet, Read, 0);
diff --git a/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h b/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h index 2d1fe05..1d13187 100644 --- a/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h +++ b/source/Plugins/Process/Utility/RegisterContextDarwin_arm64.h
@@ -83,7 +83,7 @@ // mirrors <mach/arm/thread_status.h> arm_neon_state64_t struct FPU { - VReg v[32]; + alignas(__uint128_t) VReg v[32]; uint32_t fpsr; uint32_t fpcr; };