Compare commits
51 Commits
Author | SHA1 | Date |
---|---|---|
MSVSphere Packaging Team | 9beb184db2 | 1 week ago |
MSVSphere Packaging Team | d99465ce9b | 2 weeks ago |
MSVSphere Packaging Team | 78bf4c4e73 | 3 weeks ago |
MSVSphere Packaging Team | 8ebd2a3da7 | 3 weeks ago |
MSVSphere Packaging Team | 853b5dbf5a | 1 month ago |
MSVSphere Packaging Team | fe37894acf | 1 month ago |
MSVSphere Packaging Team | 072983bfa7 | 2 months ago |
MSVSphere Packaging Team | 57a70c54e9 | 2 months ago |
MSVSphere Packaging Team | ba47f55a6a | 2 months ago |
MSVSphere Packaging Team | 532b830644 | 2 months ago |
MSVSphere Packaging Team | e5a7a8e508 | 2 months ago |
MSVSphere Packaging Team | ef5aa6a4a7 | 3 months ago |
MSVSphere Packaging Team | ead42cd36a | 3 months ago |
MSVSphere Packaging Team | 05b95bf34e | 4 months ago |
MSVSphere Packaging Team | 66e165c72d | 4 months ago |
MSVSphere Packaging Team | ca10211894 | 5 months ago |
MSVSphere Packaging Team | 5dad0ef208 | 5 months ago |
MSVSphere Packaging Team | 06b92aa661 | 5 months ago |
MSVSphere Packaging Team | ae97dda27a | 5 months ago |
MSVSphere Packaging Team | 92dc475bdd | 6 months ago |
MSVSphere Packaging Team | 183d243df4 | 6 months ago |
MSVSphere Packaging Team | df78db8131 | 6 months ago |
MSVSphere Packaging Team | af0f632a07 | 6 months ago |
MSVSphere Packaging Team | 6b3a209b4d | 6 months ago |
MSVSphere Packaging Team | 8905fd07ec | 6 months ago |
MSVSphere Packaging Team | acf9046042 | 6 months ago |
MSVSphere Packaging Team | f34bdf8397 | 6 months ago |
MSVSphere Packaging Team | c8878c87b7 | 7 months ago |
MSVSphere Packaging Team | 88ee1c91c3 | 7 months ago |
MSVSphere Packaging Team | a4be02b4e9 | 7 months ago |
MSVSphere Packaging Team | fa4df52cf3 | 7 months ago |
MSVSphere Packaging Team | 2b602f9b69 | 7 months ago |
MSVSphere Packaging Team | 3b42bdc6ec | 8 months ago |
MSVSphere Packaging Team | 8ff3908bb0 | 8 months ago |
MSVSphere Packaging Team | 65f6f3e6d3 | 8 months ago |
MSVSphere Packaging Team | 4c4ca658a1 | 8 months ago |
MSVSphere Packaging Team | fbc595288f | 9 months ago |
MSVSphere Packaging Team | e1849be597 | 9 months ago |
MSVSphere Packaging Team | b000a73579 | 9 months ago |
MSVSphere Packaging Team | 6d6f177fa9 | 9 months ago |
MSVSphere Packaging Team | bb97d33155 | 9 months ago |
MSVSphere Packaging Team | 4860a6b0fa | 9 months ago |
MSVSphere Packaging Team | aeba722f0d | 9 months ago |
MSVSphere Packaging Team | db81fda281 | 9 months ago |
MSVSphere Packaging Team | a19f493282 | 10 months ago |
MSVSphere Packaging Team | b6968fb696 | 10 months ago |
MSVSphere Packaging Team | c3dafa98e2 | 10 months ago |
MSVSphere Packaging Team | 5337242d36 | 10 months ago |
MSVSphere Packaging Team | 267e8020c0 | 11 months ago |
MSVSphere Packaging Team | 37df2044d5 | 12 months ago |
MSVSphere Packaging Team | ed1f9b6f72 | 12 months ago |
@ -0,0 +1,3 @@
|
|||||||
|
70546b31d97bfc860ac0cce544dbfd79b831ed8f SOURCES/chromium-130.0.6723.91-clean.tar.xz
|
||||||
|
7e5d2c7864c5c83ec789b59c77cd9c20d2594916 SOURCES/linux-arm64-0.19.2.tgz
|
||||||
|
dea187019741602d57aaf189a80abba261fbd2aa SOURCES/linux-x64-0.19.2.tgz
|
@ -1,37 +1,3 @@
|
|||||||
/chromium-52.0.2743.75-clean.tar.xz
|
SOURCES/chromium-130.0.6723.91-clean.tar.xz
|
||||||
/depot_tools.git-master.tar.gz
|
SOURCES/linux-arm64-0.19.2.tgz
|
||||||
/policy_templates.zip
|
SOURCES/linux-x64-0.19.2.tgz
|
||||||
/chromium-*.tar.xz
|
|
||||||
/gelasio.zip
|
|
||||||
/MuktiNarrow-0.94.tar.bz2
|
|
||||||
/NotoSansCJKjp-hinted.zip
|
|
||||||
/lohit-gurmukhi-ttf-2.91.2.tar.gz
|
|
||||||
/Arimo-BoldItalic.ttf
|
|
||||||
/Arimo-Bold.ttf
|
|
||||||
/Arimo-Italic.ttf
|
|
||||||
/Arimo-Regular.ttf
|
|
||||||
/Cousine-BoldItalic.ttf
|
|
||||||
/Cousine-Bold.ttf
|
|
||||||
/Cousine-Italic.ttf
|
|
||||||
/Cousine-Regular.ttf
|
|
||||||
/Tinos-BoldItalic.ttf
|
|
||||||
/Tinos-Bold.ttf
|
|
||||||
/Tinos-Italic.ttf
|
|
||||||
/Tinos-Regular.ttf
|
|
||||||
/Ahem.ttf
|
|
||||||
/node-v8.9.1-linux-x64.tar.gz
|
|
||||||
/node-v10.15.3-linux-x64.tar.gz
|
|
||||||
/xcb-proto-1.14.tar.xz
|
|
||||||
/NotoSansSymbols2-Regular.ttf
|
|
||||||
/NotoSansTibetan-Regular.ttf
|
|
||||||
/node-v12.22.6-linux-arm64.tar.xz
|
|
||||||
/node-v12.22.6-linux-x64.tar.xz
|
|
||||||
/node-v16.17.0-linux-x64.tar.xz
|
|
||||||
/node-v16.17.0-linux-arm64.tar.xz
|
|
||||||
/testupload
|
|
||||||
/node-v19.8.1-linux-arm64.tar.xz
|
|
||||||
/node-v19.8.1-linux-x64.tar.xz
|
|
||||||
/node-v20.6.1-linux-arm64.tar.xz
|
|
||||||
/node-v20.6.1-linux-x64.tar.xz
|
|
||||||
/linux-arm64-0.19.2.tgz
|
|
||||||
/linux-x64-0.19.2.tgz
|
|
||||||
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,57 @@
|
|||||||
|
From 40309fb53e39477490fd6928ebe67c4fb78de380 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@gmail.com>
|
||||||
|
Date: Sun, 10 Mar 2019 21:01:37 -0500
|
||||||
|
Subject: [PATCH] Add ppc64 target to libaom
|
||||||
|
|
||||||
|
---
|
||||||
|
third_party/libaom/BUILD.gn | 12 ++++++++++++
|
||||||
|
third_party/libaom/cmake_update.sh | 3 +++
|
||||||
|
2 files changed, 15 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/third_party/libaom/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libaom/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libaom/BUILD.gn
|
||||||
|
@@ -275,6 +275,18 @@ if (current_cpu == "arm64") {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+if (current_cpu == "ppc64") {
|
||||||
|
+ source_set("libaom_intrinsics_vsx") {
|
||||||
|
+ configs -= [ "//build/config/compiler:chromium_code" ]
|
||||||
|
+ configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||||
|
+ configs += [ ":libaom_config" ]
|
||||||
|
+ sources = [
|
||||||
|
+ "//third_party/libaom/source/libaom/aom_ports/ppc_cpudetect.c",
|
||||||
|
+ ]
|
||||||
|
+ sources += aom_av1_common_intrin_vsx
|
||||||
|
+ }
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
static_library("libaom") {
|
||||||
|
check_includes = false
|
||||||
|
if (!is_debug && is_win) {
|
||||||
|
@@ -338,6 +350,9 @@ static_library("libaom") {
|
||||||
|
# This is needed by all arm boards due to aom_arm_cpu_caps()
|
||||||
|
sources += [ "source/libaom/aom_ports/aarch32_cpudetect.c" ]
|
||||||
|
}
|
||||||
|
+ if (current_cpu == "ppc64") {
|
||||||
|
+ deps += [ ":libaom_intrinsics_vsx" ]
|
||||||
|
+ }
|
||||||
|
if (is_android) {
|
||||||
|
deps += [ "//third_party/cpu_features:ndk_compat" ]
|
||||||
|
}
|
||||||
|
Index: chromium-128.0.6613.113/third_party/libaom/cmake_update.sh
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libaom/cmake_update.sh
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libaom/cmake_update.sh
|
||||||
|
@@ -190,6 +190,9 @@ reset_dirs linux/arm64-cpu-detect
|
||||||
|
gen_config_files linux/arm64-cpu-detect \
|
||||||
|
"${toolchain}/arm64-linux-gcc.cmake ${all_platforms}"
|
||||||
|
|
||||||
|
+reset_dirs linux/ppc64
|
||||||
|
+gen_config_files linux/ppc64 "${toolchain}/ppc-linux-gcc.cmake ${all_platforms}"
|
||||||
|
+
|
||||||
|
# Copy linux configurations and modify for Windows.
|
||||||
|
reset_dirs win/arm64-cpu-detect
|
||||||
|
cp "${CFG}/linux/arm64-cpu-detect/config"/* \
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,30 @@
|
|||||||
|
From ea104a841fca1ff4d5430915f1b7c52c6a642f13 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Timothy Pearson <tpearson@raptorengineering.com>
|
||||||
|
Date: Fri, 21 Sep 2018 21:44:17 -0500
|
||||||
|
Subject: [PATCH] Force baseline POWER8 / AltiVec / VSX CPU features when on a
|
||||||
|
PPC64 platform in LE mode
|
||||||
|
|
||||||
|
---
|
||||||
|
BUILD.gn | 6 ++++++
|
||||||
|
1 file changed, 6 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-130.0.6723.44/v8/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/v8/BUILD.gn
|
||||||
|
+++ chromium-130.0.6723.44/v8/BUILD.gn
|
||||||
|
@@ -1431,7 +1431,14 @@ config("toolchain") {
|
||||||
|
if (v8_current_cpu == "ppc64") {
|
||||||
|
defines += [ "V8_TARGET_ARCH_PPC64" ]
|
||||||
|
cflags += [ "-ffp-contract=off" ]
|
||||||
|
- if (current_os == "aix") {
|
||||||
|
+ if (current_os == "linux") {
|
||||||
|
+ cflags += [
|
||||||
|
+ # Enable usage of AltiVec, VSX, and other POWER8 and higher features
|
||||||
|
+ "-mcpu=power8",
|
||||||
|
+ "-maltivec",
|
||||||
|
+ "-mvsx",
|
||||||
|
+ ]
|
||||||
|
+ } else if (current_os == "aix") {
|
||||||
|
cflags += [
|
||||||
|
# Work around AIX ceil, trunc and round oddities.
|
||||||
|
"-mcpu=power5+",
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,773 @@
|
|||||||
|
From cda9400739dfa064907d822f00578bb51b24a404 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Fri, 17 Aug 2018 14:18:33 -0500
|
||||||
|
Subject: [PATCH] Implement support for ppc64 on Linux
|
||||||
|
|
||||||
|
This patch implements support for the ppc64 architecture on Linux systems.
|
||||||
|
|
||||||
|
Notable changes include:
|
||||||
|
* Modification of tests to support non-4K page sizes
|
||||||
|
* minidump_writer: Determine size of stack to capture based on page size
|
||||||
|
* dump_writer_common: Introduce member function GetVectorRegisters to
|
||||||
|
ThreadInfo on ppc64 systems. This allows Altivec/VMX registers to be
|
||||||
|
dumped like they are on OS X. linux_ptrace_dumper has been updated
|
||||||
|
to utilize this function along with the ptrace mode NT_PPC_VMX.
|
||||||
|
* processor/exploitability_unittest.cc: Tests were disabled on
|
||||||
|
non-x86 systems. They assume the system objdump is capable of
|
||||||
|
disassembling x86 binaries which is not the case on other
|
||||||
|
architectures.
|
||||||
|
|
||||||
|
To-do:
|
||||||
|
* tools/linux/md2core has been updated as well, but functionality
|
||||||
|
has not been confirmed and restoration of Altivec/VMX registers
|
||||||
|
has not been implemented
|
||||||
|
|
||||||
|
Note that proper functionality depends on updates to third_party/LSS
|
||||||
|
that introduce PPC64 support. An in-progress patch that allows
|
||||||
|
breakpad to build and run successfully is available at:
|
||||||
|
https://wiki.raptorcs.com/wiki/Porting/Chromium
|
||||||
|
---
|
||||||
|
.../dump_writer_common/raw_context_cpu.h | 2 +
|
||||||
|
.../linux/dump_writer_common/thread_info.cc | 56 ++++++++++++++++++-
|
||||||
|
.../linux/dump_writer_common/thread_info.h | 9 +++
|
||||||
|
.../dump_writer_common/ucontext_reader.cc | 42 ++++++++++++++
|
||||||
|
.../dump_writer_common/ucontext_reader.h | 3 +
|
||||||
|
src/client/linux/handler/exception_handler.cc | 22 +++++++-
|
||||||
|
src/client/linux/handler/exception_handler.h | 6 +-
|
||||||
|
.../handler/exception_handler_unittest.cc | 8 ++-
|
||||||
|
.../microdump_writer/microdump_writer.cc | 14 ++++-
|
||||||
|
.../microdump_writer_unittest.cc | 15 ++++-
|
||||||
|
.../minidump_writer/linux_core_dumper.cc | 8 ++-
|
||||||
|
.../linux/minidump_writer/linux_dumper.cc | 4 +-
|
||||||
|
.../linux/minidump_writer/linux_dumper.h | 3 +-
|
||||||
|
.../linux_dumper_unittest_helper.cc | 2 +
|
||||||
|
.../minidump_writer/linux_ptrace_dumper.cc | 19 +++++--
|
||||||
|
.../linux_ptrace_dumper_unittest.cc | 5 ++
|
||||||
|
.../linux/minidump_writer/minidump_writer.cc | 18 ++++--
|
||||||
|
.../linux/minidump_writer/minidump_writer.h | 2 +
|
||||||
|
.../minidump_writer_unittest.cc | 3 +
|
||||||
|
src/common/linux/memory_mapped_file.cc | 3 +-
|
||||||
|
.../linux/memory_mapped_file_unittest.cc | 7 ++-
|
||||||
|
src/common/memory_allocator_unittest.cc | 3 +-
|
||||||
|
src/processor/exploitability_linux.cc | 2 +
|
||||||
|
src/processor/exploitability_unittest.cc | 15 +++--
|
||||||
|
src/tools/linux/md2core/minidump-2-core.cc | 45 +++++++++++++++
|
||||||
|
25 files changed, 281 insertions(+), 35 deletions(-)
|
||||||
|
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/raw_context_cpu.h
|
||||||
|
@@ -51,6 +51,8 @@ typedef MDRawContextRISCV64 RawContextCP
|
||||||
|
# else
|
||||||
|
# error "Unexpected __riscv_xlen"
|
||||||
|
# endif
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+typedef MDRawContextPPC64 RawContextCPU;
|
||||||
|
#else
|
||||||
|
#error "This code has not been ported to your platform yet."
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.cc
|
||||||
|
@@ -336,7 +336,42 @@ void ThreadInfo::FillCPUContext(RawConte
|
||||||
|
#error "Unexpected __riscv_xlen"
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
-#endif // __riscv
|
||||||
|
+
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+
|
||||||
|
+uintptr_t ThreadInfo::GetInstructionPointer() const {
|
||||||
|
+ return mcontext.gp_regs[PT_NIP];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void ThreadInfo::FillCPUContext(RawContextCPU* out) const {
|
||||||
|
+ out->context_flags = MD_CONTEXT_PPC64_FULL;
|
||||||
|
+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
|
||||||
|
+ out->gpr[i] = mcontext.gp_regs[i];
|
||||||
|
+
|
||||||
|
+ out->lr = mcontext.gp_regs[PT_LNK];
|
||||||
|
+ out->srr0 = mcontext.gp_regs[PT_NIP];
|
||||||
|
+ out->srr1 = mcontext.gp_regs[PT_MSR];
|
||||||
|
+ out->cr = mcontext.gp_regs[PT_CCR];
|
||||||
|
+ out->xer = mcontext.gp_regs[PT_XER];
|
||||||
|
+ out->ctr = mcontext.gp_regs[PT_CTR];
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
|
||||||
|
+ out->float_save.fpregs[i] = mcontext.fp_regs[i];
|
||||||
|
+
|
||||||
|
+ out->float_save.fpscr = mcontext.fp_regs[NFPREG-1];
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
|
||||||
|
+ out->vector_save.save_vr[i] = \
|
||||||
|
+ {(((uint64_t)vregs.vrregs[i][0]) << 32)
|
||||||
|
+ | vregs.vrregs[i][1],
|
||||||
|
+ (((uint64_t)vregs.vrregs[i][2]) << 32)
|
||||||
|
+ | vregs.vrregs[i][3]};
|
||||||
|
+
|
||||||
|
+ out->vrsave = vregs.vrsave;
|
||||||
|
+ out->vector_save.save_vscr = {0, vregs.vscr.vscr_word};
|
||||||
|
+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
|
||||||
|
+}
|
||||||
|
+#endif // __powerpc64__
|
||||||
|
|
||||||
|
void ThreadInfo::GetGeneralPurposeRegisters(void** gp_regs, size_t* size) {
|
||||||
|
assert(gp_regs || size);
|
||||||
|
@@ -350,6 +385,11 @@ void ThreadInfo::GetGeneralPurposeRegist
|
||||||
|
*gp_regs = mcontext.__gregs;
|
||||||
|
if (size)
|
||||||
|
*size = sizeof(mcontext.__gregs);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ if (gp_regs)
|
||||||
|
+ *gp_regs = mcontext.gp_regs;
|
||||||
|
+ if (size)
|
||||||
|
+ *size = sizeof(mcontext.gp_regs);
|
||||||
|
#else
|
||||||
|
if (gp_regs)
|
||||||
|
*gp_regs = ®s;
|
||||||
|
@@ -384,6 +424,11 @@ void ThreadInfo::GetFloatingPointRegiste
|
||||||
|
# else
|
||||||
|
# error "Unexpected __riscv_flen"
|
||||||
|
# endif
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ if (fp_regs)
|
||||||
|
+ *fp_regs = &mcontext.fp_regs;
|
||||||
|
+ if (size)
|
||||||
|
+ *size = sizeof(mcontext.fp_regs);
|
||||||
|
#else
|
||||||
|
if (fp_regs)
|
||||||
|
*fp_regs = &fpregs;
|
||||||
|
@@ -392,4 +437,13 @@ void ThreadInfo::GetFloatingPointRegiste
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+void ThreadInfo::GetVectorRegisters(void** v_regs, size_t* size) {
|
||||||
|
+ if (v_regs)
|
||||||
|
+ *v_regs = &vregs;
|
||||||
|
+ if (size)
|
||||||
|
+ *size = sizeof(vregs);
|
||||||
|
+}
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
} // namespace google_breakpad
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/thread_info.h
|
||||||
|
@@ -67,6 +67,10 @@ struct ThreadInfo {
|
||||||
|
// Use the structures defined in <sys/user.h>
|
||||||
|
struct user_regs_struct regs;
|
||||||
|
struct user_fpsimd_struct fpregs;
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ // Use the structures defined in <sys/ucontext.h>.
|
||||||
|
+ mcontext_t mcontext;
|
||||||
|
+ struct _libc_vrstate vregs;
|
||||||
|
#elif defined(__mips__) || defined(__riscv)
|
||||||
|
// Use the structure defined in <sys/ucontext.h>.
|
||||||
|
mcontext_t mcontext;
|
||||||
|
@@ -83,6 +87,11 @@ struct ThreadInfo {
|
||||||
|
|
||||||
|
// Returns the pointer and size of float point register area.
|
||||||
|
void GetFloatingPointRegisters(void** fp_regs, size_t* size);
|
||||||
|
+
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // Returns the pointer and size of the vector register area. (PPC64 only)
|
||||||
|
+ void GetVectorRegisters(void** v_regs, size_t* size);
|
||||||
|
+#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
} // namespace google_breakpad
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.cc
|
||||||
|
@@ -324,6 +324,48 @@ void UContextReader::FillCPUContext(RawC
|
||||||
|
#error "Unexpected __riscv_xlen"
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+
|
||||||
|
+uintptr_t UContextReader::GetStackPointer(const ucontext_t* uc) {
|
||||||
|
+ return uc->uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+uintptr_t UContextReader::GetInstructionPointer(const ucontext_t* uc) {
|
||||||
|
+ return uc->uc_mcontext.gp_regs[PT_NIP];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+void UContextReader::FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
|
||||||
|
+ const struct _libc_vrstate* vregs) {
|
||||||
|
+ out->context_flags = MD_CONTEXT_PPC64_FULL;
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
|
||||||
|
+ out->gpr[i] = uc->uc_mcontext.gp_regs[i];
|
||||||
|
+
|
||||||
|
+ out->lr = uc->uc_mcontext.gp_regs[PT_LNK];
|
||||||
|
+ out->srr0 = uc->uc_mcontext.gp_regs[PT_NIP];
|
||||||
|
+ out->srr1 = uc->uc_mcontext.gp_regs[PT_MSR];
|
||||||
|
+ out->cr = uc->uc_mcontext.gp_regs[PT_CCR];
|
||||||
|
+ out->xer = uc->uc_mcontext.gp_regs[PT_XER];
|
||||||
|
+ out->ctr = uc->uc_mcontext.gp_regs[PT_CTR];
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
|
||||||
|
+ out->float_save.fpregs[i] = uc->uc_mcontext.fp_regs[i];
|
||||||
|
+
|
||||||
|
+ out->float_save.fpscr = uc->uc_mcontext.fp_regs[NFPREG-1];
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++)
|
||||||
|
+ out->vector_save.save_vr[i] =
|
||||||
|
+ {(((uint64_t)vregs->vrregs[i][0]) << 32)
|
||||||
|
+ | vregs->vrregs[i][1],
|
||||||
|
+ (((uint64_t)vregs->vrregs[i][2]) << 32)
|
||||||
|
+ | vregs->vrregs[i][3]};
|
||||||
|
+
|
||||||
|
+ out->vrsave = vregs->vrsave;
|
||||||
|
+ out->vector_save.save_vscr = {0, vregs->vscr.vscr_word};
|
||||||
|
+ out->vector_save.save_vrvalid = 0xFFFFFFFF;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
|
||||||
|
} // namespace google_breakpad
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/dump_writer_common/ucontext_reader.h
|
||||||
|
@@ -54,6 +54,9 @@ struct UContextReader {
|
||||||
|
#elif defined(__aarch64__)
|
||||||
|
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc,
|
||||||
|
const struct fpsimd_context* fpregs);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ static void FillCPUContext(RawContextCPU *out, const ucontext_t *uc,
|
||||||
|
+ const struct _libc_vrstate* vregs);
|
||||||
|
#else
|
||||||
|
static void FillCPUContext(RawContextCPU* out, const ucontext_t* uc);
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.cc
|
||||||
|
@@ -464,6 +464,13 @@ bool ExceptionHandler::HandleSignal(int
|
||||||
|
memcpy(&g_crash_context_.float_state, fp_ptr,
|
||||||
|
sizeof(g_crash_context_.float_state));
|
||||||
|
}
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ // On PPC64, we must copy VR state
|
||||||
|
+ ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
|
+ if (uc_ptr->uc_mcontext.v_regs) {
|
||||||
|
+ memcpy(&g_crash_context_.vector_state, uc_ptr->uc_mcontext.v_regs,
|
||||||
|
+ sizeof(g_crash_context_.vector_state));
|
||||||
|
+ }
|
||||||
|
#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
ucontext_t* uc_ptr = (ucontext_t*)uc;
|
||||||
|
if (uc_ptr->uc_mcontext.fpregs) {
|
||||||
|
@@ -701,10 +708,18 @@ bool ExceptionHandler::WriteMinidump() {
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE && !defined(__aarch64__)
|
||||||
|
+#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE && !defined(__aarch64__) \
|
||||||
|
+ && !defined(__powerpc64__)
|
||||||
|
memcpy(&context.float_state, context.context.uc_mcontext.fpregs,
|
||||||
|
sizeof(context.float_state));
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // Vector registers must be copied on PPC64
|
||||||
|
+ memcpy(&context.vector_state, context.context.uc_mcontext.v_regs,
|
||||||
|
+ sizeof(context.vector_state));
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
context.tid = sys_gettid();
|
||||||
|
|
||||||
|
// Add an exception stream to the minidump for better reporting.
|
||||||
|
@@ -725,6 +740,9 @@ bool ExceptionHandler::WriteMinidump() {
|
||||||
|
#elif defined(__mips__)
|
||||||
|
context.siginfo.si_addr =
|
||||||
|
reinterpret_cast<void*>(context.context.uc_mcontext.pc);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ context.siginfo.si_addr =
|
||||||
|
+ reinterpret_cast<void*>(context.context.uc_mcontext.gp_regs[PT_NIP]);
|
||||||
|
#elif defined(__riscv)
|
||||||
|
context.siginfo.si_addr =
|
||||||
|
reinterpret_cast<void*>(context.context.uc_mcontext.__gregs[REG_PC]);
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler.h
|
||||||
|
@@ -200,7 +200,11 @@ class ExceptionHandler {
|
||||||
|
siginfo_t siginfo;
|
||||||
|
pid_t tid; // the crashing thread.
|
||||||
|
ucontext_t context;
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // PPC64's FP state is a part of ucontext_t like MIPS but the vector
|
||||||
|
+ // state is not, so a struct is needed.
|
||||||
|
+ vstate_t vector_state;
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
fpstate_t float_state;
|
||||||
|
#endif
|
||||||
|
};
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/handler/exception_handler_unittest.cc
|
||||||
|
@@ -321,7 +321,7 @@ TEST(ExceptionHandlerTest, ParallelChild
|
||||||
|
ASSERT_EQ(SIGSEGV, WTERMSIG(status));
|
||||||
|
return;
|
||||||
|
} else {
|
||||||
|
- usleep(100000);
|
||||||
|
+ usleep(200000);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -576,6 +576,8 @@ const unsigned char kIllegalInstruction[
|
||||||
|
#if defined(__mips__)
|
||||||
|
// mfc2 zero,Impl - usually illegal in userspace.
|
||||||
|
0x48, 0x00, 0x00, 0x48
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ 0x01, 0x01, 0x01, 0x01 // Crashes on a tested POWER9 cpu
|
||||||
|
#else
|
||||||
|
// This crashes with SIGILL on x86/x86-64/arm.
|
||||||
|
0xff, 0xff, 0xff, 0xff
|
||||||
|
@@ -771,10 +773,10 @@ TEST(ExceptionHandlerTest, InstructionPo
|
||||||
|
|
||||||
|
// These are defined here so the parent can use them to check the
|
||||||
|
// data from the minidump afterwards.
|
||||||
|
- // Use 4k here because the OS will hand out a single page even
|
||||||
|
+ // Use the page size here because the OS will hand out a single page even
|
||||||
|
// if a smaller size is requested, and this test wants to
|
||||||
|
// test the upper bound of the memory range.
|
||||||
|
- const uint32_t kMemorySize = 4096; // bytes
|
||||||
|
+ const uint32_t kMemorySize = getpagesize(); // bytes
|
||||||
|
const int kOffset = kMemorySize - sizeof(kIllegalInstruction);
|
||||||
|
|
||||||
|
const pid_t child = fork();
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer.cc
|
||||||
|
@@ -141,7 +141,9 @@ class MicrodumpWriter {
|
||||||
|
const MicrodumpExtraInfo& microdump_extra_info,
|
||||||
|
LinuxDumper* dumper)
|
||||||
|
: ucontext_(context ? &context->context : NULL),
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ vector_state_(context ? &context->vector_state : NULL),
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
float_state_(context ? &context->float_state : NULL),
|
||||||
|
#endif
|
||||||
|
dumper_(dumper),
|
||||||
|
@@ -348,6 +350,8 @@ class MicrodumpWriter {
|
||||||
|
# else
|
||||||
|
# error "Unexpected __riscv_xlen"
|
||||||
|
# endif
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ const char kArch[] = "ppc64";
|
||||||
|
#else
|
||||||
|
# error "This code has not been ported to your platform yet"
|
||||||
|
#endif
|
||||||
|
@@ -420,7 +424,9 @@ class MicrodumpWriter {
|
||||||
|
void DumpCPUState() {
|
||||||
|
RawContextCPU cpu;
|
||||||
|
my_memset(&cpu, 0, sizeof(RawContextCPU));
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ UContextReader::FillCPUContext(&cpu, ucontext_, vector_state_);
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
UContextReader::FillCPUContext(&cpu, ucontext_, float_state_);
|
||||||
|
#else
|
||||||
|
UContextReader::FillCPUContext(&cpu, ucontext_);
|
||||||
|
@@ -616,7 +622,9 @@ class MicrodumpWriter {
|
||||||
|
void* Alloc(unsigned bytes) { return dumper_->allocator()->Alloc(bytes); }
|
||||||
|
|
||||||
|
const ucontext_t* const ucontext_;
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ const google_breakpad::vstate_t* const vector_state_;
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
const google_breakpad::fpstate_t* const float_state_;
|
||||||
|
#endif
|
||||||
|
LinuxDumper* dumper_;
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/microdump_writer/microdump_writer_unittest.cc
|
||||||
|
@@ -282,10 +282,19 @@ TEST(MicrodumpWriterTest, BasicWithMappi
|
||||||
|
CrashAndGetMicrodump(mappings, MicrodumpExtraInfo(), &buf);
|
||||||
|
ASSERT_TRUE(ContainsMicrodump(buf));
|
||||||
|
|
||||||
|
+ int page_size = getpagesize();
|
||||||
|
#ifdef __LP64__
|
||||||
|
- ASSERT_NE(std::string::npos,
|
||||||
|
- buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
|
||||||
|
- "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
|
||||||
|
+ // This test is only available for the following page sizes
|
||||||
|
+ ASSERT_TRUE((page_size == 4096) || (page_size == 65536));
|
||||||
|
+ if (page_size == 4096) {
|
||||||
|
+ ASSERT_NE(std::string::npos,
|
||||||
|
+ buf.find("M 0000000000001000 000000000000002A 0000000000001000 "
|
||||||
|
+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
|
||||||
|
+ } else {
|
||||||
|
+ ASSERT_NE(std::string::npos,
|
||||||
|
+ buf.find("M 0000000000010000 000000000000002A 0000000000010000 "
|
||||||
|
+ "33221100554477668899AABBCCDDEEFF0 libfoo.so"));
|
||||||
|
+ }
|
||||||
|
#else
|
||||||
|
ASSERT_NE(std::string::npos,
|
||||||
|
buf.find("M 00001000 0000002A 00001000 "
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_core_dumper.cc
|
||||||
|
@@ -118,6 +118,9 @@ bool LinuxCoreDumper::GetThreadInfoByInd
|
||||||
|
#elif defined(__riscv)
|
||||||
|
stack_pointer = reinterpret_cast<uint8_t*>(
|
||||||
|
info->mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP]);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ stack_pointer =
|
||||||
|
+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
|
||||||
|
#else
|
||||||
|
# error "This code hasn't been ported to your platform yet."
|
||||||
|
#endif
|
||||||
|
@@ -213,7 +216,10 @@ bool LinuxCoreDumper::EnumerateThreads()
|
||||||
|
memset(&info, 0, sizeof(ThreadInfo));
|
||||||
|
info.tgid = status->pr_pgrp;
|
||||||
|
info.ppid = status->pr_ppid;
|
||||||
|
-#if defined(__mips__)
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ for (int i = 0; i < 31; i++)
|
||||||
|
+ info.mcontext.gp_regs[i] = status->pr_reg[i];
|
||||||
|
+#elif defined(__mips__)
|
||||||
|
# if defined(__ANDROID__)
|
||||||
|
for (int i = EF_R0; i <= EF_R31; i++)
|
||||||
|
info.mcontext.gregs[i - EF_R0] = status->pr_reg[i];
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.cc
|
||||||
|
@@ -770,7 +770,9 @@ bool LinuxDumper::GetStackInfo(const voi
|
||||||
|
reinterpret_cast<uint8_t*>(int_stack_pointer & ~(page_size - 1));
|
||||||
|
|
||||||
|
// The number of bytes of stack which we try to capture.
|
||||||
|
- static const ptrdiff_t kStackToCapture = 32 * 1024;
|
||||||
|
+ // This now depends on page_size to avoid missing data
|
||||||
|
+ // on systems with larger page sizes.
|
||||||
|
+ static const ptrdiff_t kStackToCapture = 8 * page_size;
|
||||||
|
|
||||||
|
const MappingInfo* mapping = FindMapping(stack_pointer);
|
||||||
|
if (!mapping)
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper.h
|
||||||
|
@@ -64,7 +64,8 @@ namespace google_breakpad {
|
||||||
|
typedef Elf32_auxv_t elf_aux_entry;
|
||||||
|
#elif defined(__x86_64) || defined(__aarch64__) || \
|
||||||
|
(defined(__mips__) && _MIPS_SIM != _ABIO32) || \
|
||||||
|
- (defined(__riscv) && __riscv_xlen == 64)
|
||||||
|
+ (defined(__riscv) && __riscv_xlen == 64) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
typedef Elf64_auxv_t elf_aux_entry;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_dumper_unittest_helper.cc
|
||||||
|
@@ -56,6 +56,8 @@
|
||||||
|
#define TID_PTR_REGISTER "$1"
|
||||||
|
#elif defined(__riscv)
|
||||||
|
#define TID_PTR_REGISTER "x4"
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+#define TID_PTR_REGISTER "r8"
|
||||||
|
#else
|
||||||
|
#error This test has not been ported to this platform.
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper.cc
|
||||||
|
@@ -208,12 +208,12 @@ bool LinuxPtraceDumper::ReadRegisterSet(
|
||||||
|
#ifdef PTRACE_GETREGSET
|
||||||
|
struct iovec io;
|
||||||
|
info->GetGeneralPurposeRegisters(&io.iov_base, &io.iov_len);
|
||||||
|
- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
|
||||||
|
+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PRSTATUS, (void*)&io) == -1) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
info->GetFloatingPointRegisters(&io.iov_base, &io.iov_len);
|
||||||
|
- if (sys_ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
|
||||||
|
+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_FPREGSET, (void*)&io) == -1) {
|
||||||
|
// We are going to check if we can read VFP registers on ARM32.
|
||||||
|
// Currently breakpad does not support VFP registers to be a part of minidump,
|
||||||
|
// so this is only to confirm that we can actually read FP registers.
|
||||||
|
@@ -233,6 +233,15 @@ bool LinuxPtraceDumper::ReadRegisterSet(
|
||||||
|
}
|
||||||
|
#endif // defined(__arm__)
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // Grab the vector registers on PPC64 too
|
||||||
|
+ info->GetVectorRegisters(&io.iov_base, &io.iov_len);
|
||||||
|
+ if (ptrace(PTRACE_GETREGSET, tid, (void*)NT_PPC_VMX, (void*)&io) == -1) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+#endif // defined(__powerpc64__)
|
||||||
|
+
|
||||||
|
return true;
|
||||||
|
#else
|
||||||
|
return false;
|
||||||
|
@@ -397,6 +406,9 @@ bool LinuxPtraceDumper::GetThreadInfoByI
|
||||||
|
#elif defined(__riscv)
|
||||||
|
stack_pointer = reinterpret_cast<uint8_t*>(
|
||||||
|
info->mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP]);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ stack_pointer =
|
||||||
|
+ reinterpret_cast<uint8_t*>(info->mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP]);
|
||||||
|
#else
|
||||||
|
# error "This code hasn't been ported to your platform yet."
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/linux_ptrace_dumper_unittest.cc
|
||||||
|
@@ -470,6 +470,9 @@ TEST(LinuxPtraceDumperTest, VerifyStackR
|
||||||
|
#elif defined(__riscv)
|
||||||
|
pid_t* process_tid_location =
|
||||||
|
reinterpret_cast<pid_t*>(one_thread.mcontext.__gregs[4]);
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ pid_t* process_tid_location =
|
||||||
|
+ reinterpret_cast<pid_t*>(one_thread.mcontext.gp_regs[8]);
|
||||||
|
#else
|
||||||
|
#error This test has not been ported to this platform.
|
||||||
|
#endif
|
||||||
|
@@ -569,6 +572,8 @@ TEST_F(LinuxPtraceDumperTest, SanitizeSt
|
||||||
|
uintptr_t heap_addr = thread_info.mcontext.gregs[1];
|
||||||
|
#elif defined(__riscv)
|
||||||
|
uintptr_t heap_addr = thread_info.mcontext.__gregs[4];
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ uintptr_t heap_addr = thread_info.mcontext.gp_regs[8];
|
||||||
|
#else
|
||||||
|
#error This test has not been ported to this platform.
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.cc
|
||||||
|
@@ -144,7 +144,9 @@ class MinidumpWriter {
|
||||||
|
: fd_(minidump_fd),
|
||||||
|
path_(minidump_path),
|
||||||
|
ucontext_(context ? &context->context : NULL),
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ vector_state_(context ? &context->vector_state : NULL),
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
float_state_(context ? &context->float_state : NULL),
|
||||||
|
#endif
|
||||||
|
dumper_(dumper),
|
||||||
|
@@ -476,7 +478,9 @@ class MinidumpWriter {
|
||||||
|
if (!cpu.Allocate())
|
||||||
|
return false;
|
||||||
|
my_memset(cpu.get(), 0, sizeof(RawContextCPU));
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ UContextReader::FillCPUContext(cpu.get(), ucontext_, vector_state_);
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
UContextReader::FillCPUContext(cpu.get(), ucontext_, float_state_);
|
||||||
|
#else
|
||||||
|
UContextReader::FillCPUContext(cpu.get(), ucontext_);
|
||||||
|
@@ -953,7 +957,7 @@ class MinidumpWriter {
|
||||||
|
dirent->location.rva = 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || defined(__powerpc64__)
|
||||||
|
bool WriteCPUInformation(MDRawSystemInfo* sys_info) {
|
||||||
|
char vendor_id[sizeof(sys_info->cpu.x86_cpu_info.vendor_id) + 1] = {0};
|
||||||
|
static const char vendor_id_name[] = "vendor_id";
|
||||||
|
@@ -973,7 +977,9 @@ class MinidumpWriter {
|
||||||
|
|
||||||
|
// processor_architecture should always be set, do this first
|
||||||
|
sys_info->processor_architecture =
|
||||||
|
-#if defined(__mips__)
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ MD_CPU_ARCHITECTURE_PPC64;
|
||||||
|
+#elif defined(__mips__)
|
||||||
|
# if _MIPS_SIM == _ABIO32
|
||||||
|
MD_CPU_ARCHITECTURE_MIPS;
|
||||||
|
# elif _MIPS_SIM == _ABI64
|
||||||
|
@@ -1440,7 +1446,9 @@ class MinidumpWriter {
|
||||||
|
const char* path_; // Path to the file where the minidum should be written.
|
||||||
|
|
||||||
|
const ucontext_t* const ucontext_; // also from the signal handler
|
||||||
|
-#if GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ const google_breakpad::vstate_t* const vector_state_;
|
||||||
|
+#elif GOOGLE_BREAKPAD_CRASH_CONTEXT_HAS_FLOAT_STATE
|
||||||
|
const google_breakpad::fpstate_t* const float_state_; // ditto
|
||||||
|
#endif
|
||||||
|
LinuxDumper* dumper_;
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer.h
|
||||||
|
@@ -47,6 +47,8 @@ class ExceptionHandler;
|
||||||
|
|
||||||
|
#if defined(__aarch64__)
|
||||||
|
typedef struct fpsimd_context fpstate_t;
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+typedef struct _libc_vrstate vstate_t;
|
||||||
|
#elif !defined(__ARM_EABI__) && !defined(__mips__)
|
||||||
|
typedef std::remove_pointer<fpregset_t>::type fpstate_t;
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc
|
||||||
|
@@ -723,6 +723,9 @@ TEST(MinidumpWriterTest, InvalidStackPoi
|
||||||
|
#elif defined(__riscv)
|
||||||
|
context.context.uc_mcontext.__gregs[MD_CONTEXT_RISCV_REG_SP] =
|
||||||
|
invalid_stack_pointer;
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ context.context.uc_mcontext.gp_regs[MD_CONTEXT_PPC64_REG_SP] =
|
||||||
|
+ invalid_stack_pointer;
|
||||||
|
#else
|
||||||
|
# error "This code has not been ported to your platform yet."
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file.cc
|
||||||
|
@@ -72,8 +72,7 @@ bool MemoryMappedFile::Map(const char* p
|
||||||
|
|
||||||
|
#if defined(__x86_64__) || defined(__aarch64__) || \
|
||||||
|
(defined(__mips__) && _MIPS_SIM == _ABI64) || \
|
||||||
|
- (defined(__riscv) && __riscv_xlen == 64)
|
||||||
|
-
|
||||||
|
+ (defined(__riscv) && __riscv_xlen == 64) || defined(__powerpc64__)
|
||||||
|
struct kernel_stat st;
|
||||||
|
if (sys_fstat(fd, &st) == -1 || st.st_size < 0) {
|
||||||
|
#else
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/linux/memory_mapped_file_unittest.cc
|
||||||
|
@@ -179,9 +179,10 @@ TEST_F(MemoryMappedFileTest, RemapAfterM
|
||||||
|
TEST_F(MemoryMappedFileTest, MapWithOffset) {
|
||||||
|
// Put more data in the test file this time. Offsets can only be
|
||||||
|
// done on page boundaries, so we need a two page file to test this.
|
||||||
|
- const int page_size = 4096;
|
||||||
|
- char data1[2 * page_size];
|
||||||
|
- size_t data1_size = sizeof(data1);
|
||||||
|
+ const int page_size = getpagesize();
|
||||||
|
+ char *data1 = static_cast<char*>(malloc(2 * page_size));
|
||||||
|
+ EXPECT_TRUE(data1 != NULL);
|
||||||
|
+ size_t data1_size = (2 * page_size);
|
||||||
|
for (size_t i = 0; i < data1_size; ++i) {
|
||||||
|
data1[i] = i & 0x7f;
|
||||||
|
}
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/common/memory_allocator_unittest.cc
|
||||||
|
@@ -60,8 +60,9 @@ TEST(PageAllocatorTest, LargeObject) {
|
||||||
|
|
||||||
|
EXPECT_EQ(0U, allocator.pages_allocated());
|
||||||
|
uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(10000));
|
||||||
|
+ uint64_t expected_pages = 1 + ((10000 - 1) / getpagesize());
|
||||||
|
ASSERT_FALSE(p == NULL);
|
||||||
|
- EXPECT_EQ(3U, allocator.pages_allocated());
|
||||||
|
+ EXPECT_EQ(expected_pages, allocator.pages_allocated());
|
||||||
|
for (unsigned i = 1; i < 10; ++i) {
|
||||||
|
uint8_t* p = reinterpret_cast<uint8_t*>(allocator.Alloc(i));
|
||||||
|
ASSERT_FALSE(p == NULL);
|
||||||
|
Index: chromium-130.0.6723.44/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/breakpad/breakpad/src/tools/linux/md2core/minidump-2-core.cc
|
||||||
|
@@ -82,6 +82,8 @@
|
||||||
|
#define ELF_ARCH EM_AARCH64
|
||||||
|
#elif defined(__riscv)
|
||||||
|
#define ELF_ARCH EM_RISCV
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ #define ELF_ARCH EM_PPC64
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__arm__)
|
||||||
|
@@ -92,6 +94,8 @@ typedef user_regs user_regs_struct;
|
||||||
|
#elif defined (__mips__) || defined(__riscv)
|
||||||
|
// This file-local typedef simplifies the source code.
|
||||||
|
typedef gregset_t user_regs_struct;
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+typedef struct pt_regs user_regs_struct;
|
||||||
|
#endif
|
||||||
|
|
||||||
|
using google_breakpad::MDTypeHelper;
|
||||||
|
@@ -324,6 +328,9 @@ struct CrashedProcess {
|
||||||
|
#if defined(__aarch64__)
|
||||||
|
user_fpsimd_struct fpregs;
|
||||||
|
#endif
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ mcontext_t mcontext;
|
||||||
|
+#endif
|
||||||
|
uintptr_t stack_addr;
|
||||||
|
const uint8_t* stack;
|
||||||
|
size_t stack_length;
|
||||||
|
@@ -627,6 +634,38 @@ ParseThreadRegisters(CrashedProcess::Thr
|
||||||
|
#error "Unexpected __riscv_xlen"
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+static void
|
||||||
|
+ParseThreadRegisters(CrashedProcess::Thread* thread,
|
||||||
|
+ const MinidumpMemoryRange& range) {
|
||||||
|
+ const MDRawContextPPC64* rawregs = range.GetData<MDRawContextPPC64>(0);
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_CONTEXT_PPC64_GPR_COUNT; i++)
|
||||||
|
+ thread->mcontext.gp_regs[i] = rawregs->gpr[i];
|
||||||
|
+
|
||||||
|
+ thread->mcontext.gp_regs[PT_LNK] = rawregs->lr;
|
||||||
|
+ thread->mcontext.gp_regs[PT_NIP] = rawregs->srr0;
|
||||||
|
+ thread->mcontext.gp_regs[PT_MSR] = rawregs->srr1;
|
||||||
|
+ thread->mcontext.gp_regs[PT_CCR] = rawregs->cr;
|
||||||
|
+ thread->mcontext.gp_regs[PT_XER] = rawregs->xer;
|
||||||
|
+ thread->mcontext.gp_regs[PT_CTR] = rawregs->ctr;
|
||||||
|
+ thread->mcontext.v_regs->vrsave = rawregs->vrsave;
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_FLOATINGSAVEAREA_PPC_FPR_COUNT; i++)
|
||||||
|
+ thread->mcontext.fp_regs[i] = rawregs->float_save.fpregs[i];
|
||||||
|
+
|
||||||
|
+ thread->mcontext.fp_regs[NFPREG-1] = rawregs->float_save.fpscr;
|
||||||
|
+
|
||||||
|
+ for (int i = 0; i < MD_VECTORSAVEAREA_PPC_VR_COUNT; i++) {
|
||||||
|
+ thread->mcontext.v_regs->vrregs[i][0] = rawregs->vector_save.save_vr[i].high >> 32;
|
||||||
|
+ thread->mcontext.v_regs->vrregs[i][1] = rawregs->vector_save.save_vr[i].high;
|
||||||
|
+ thread->mcontext.v_regs->vrregs[i][2] = rawregs->vector_save.save_vr[i].low >> 32;
|
||||||
|
+ thread->mcontext.v_regs->vrregs[i][3] = rawregs->vector_save.save_vr[i].low;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ thread->mcontext.v_regs->vscr.vscr_word = rawregs->vector_save.save_vscr.low & 0xFFFFFFFF;
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
#error "This code has not been ported to your platform yet"
|
||||||
|
#endif
|
||||||
|
@@ -732,6 +771,12 @@ ParseSystemInfo(const Options& options,
|
||||||
|
# else
|
||||||
|
# error "Unexpected __riscv_xlen"
|
||||||
|
# endif
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ if (sysinfo->processor_architecture != MD_CPU_ARCHITECTURE_PPC64) {
|
||||||
|
+ fprintf(stderr,
|
||||||
|
+ "This version of minidump-2-core only supports PPC64.\n");
|
||||||
|
+ exit(1);
|
||||||
|
+ }
|
||||||
|
#else
|
||||||
|
#error "This code has not been ported to your platform yet"
|
||||||
|
#endif
|
@ -0,0 +1,37 @@
|
|||||||
|
From b3a14db7637232d30c878cc1f1ad6d8037e81379 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawn@anastas.io>
|
||||||
|
Date: Tue, 15 Jan 2019 22:42:21 -0600
|
||||||
|
Subject: [PATCH] linux/seccomp-bpf: ppc64+glibc workaround in SIGSYS handler
|
||||||
|
|
||||||
|
Workaround for an apparent issue with glibc negating syscall
|
||||||
|
parameters. Observed on a ppc64le machine with glibc.
|
||||||
|
More investigation required.
|
||||||
|
---
|
||||||
|
sandbox/linux/seccomp-bpf/trap.cc | 14 ++++++++++++++
|
||||||
|
1 file changed, 14 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/trap.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf/trap.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/trap.cc
|
||||||
|
@@ -236,6 +236,20 @@ void Trap::SigSys(int nr, LinuxSigInfo*
|
||||||
|
SetIsInSigHandler();
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
|
||||||
|
+ // parameter which causes checks against it to fail. For now, manually
|
||||||
|
+ // negate them back.
|
||||||
|
+ // TODO(shawn@anastas.io): investigate this issue further
|
||||||
|
+ auto nr = SECCOMP_SYSCALL(ctx);
|
||||||
|
+ if (nr == __NR_openat || nr == __NR_mkdirat || nr == __NR_faccessat || nr == __NR_readlinkat ||
|
||||||
|
+ nr == __NR_renameat || nr == __NR_renameat2 || nr == __NR_newfstatat || nr == __NR_unlinkat) {
|
||||||
|
+ if (static_cast<int>(SECCOMP_PARM1(ctx)) > 0) {
|
||||||
|
+ SECCOMP_PARM1(ctx) = -SECCOMP_PARM1(ctx);
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// Copy the seccomp-specific data into a arch_seccomp_data structure. This
|
||||||
|
// is what we are showing to TrapFnc callbacks that the system call
|
||||||
|
// evaluator registered with the sandbox.
|
@ -0,0 +1,23 @@
|
|||||||
|
From 0c65e40ae578b743b5f06956597ebc9700768d18 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 22:45:47 -0500
|
||||||
|
Subject: [PATCH 1/1] sandbox: Enable seccomp_bpf for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/features.gni | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/features.gni
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/features.gni
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/features.gni
|
||||||
|
@@ -9,7 +9,8 @@
|
||||||
|
use_seccomp_bpf = (is_linux || is_chromeos || is_android) &&
|
||||||
|
(current_cpu == "x86" || current_cpu == "x64" ||
|
||||||
|
current_cpu == "arm" || current_cpu == "arm64" ||
|
||||||
|
- current_cpu == "mipsel" || current_cpu == "mips64el")
|
||||||
|
+ current_cpu == "mipsel" || current_cpu == "mips64el" ||
|
||||||
|
+ current_cpu == "ppc64")
|
||||||
|
|
||||||
|
# SSBD (Speculative Store Bypass Disable) is a mitigation of Spectre Variant 4.
|
||||||
|
# As Spectre Variant 4 can be mitigated by site isolation, opt-out SSBD on site
|
@ -0,0 +1,80 @@
|
|||||||
|
From 036d209a3f1a771de9aed31dfbe804aaf91d1c27 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 23:35:21 -0500
|
||||||
|
Subject: [PATCH] sandbox/linux: Implement partial support for ppc64 syscalls
|
||||||
|
and ucontext
|
||||||
|
|
||||||
|
Unlike other architectures, the ppc64 files currently rely on applicable
|
||||||
|
headers being provided by the system. It is sufficient for standard
|
||||||
|
GNU/Linux environments, but may require expansion elsewhere.
|
||||||
|
---
|
||||||
|
sandbox/linux/BUILD.gn | 2 ++
|
||||||
|
sandbox/linux/system_headers/linux_syscalls.h | 4 ++++
|
||||||
|
sandbox/linux/system_headers/linux_ucontext.h | 2 ++
|
||||||
|
sandbox/linux/system_headers/ppc64_linux_syscalls.h | 12 ++++++++++++
|
||||||
|
sandbox/linux/system_headers/ppc64_linux_ucontext.h | 12 ++++++++++++
|
||||||
|
5 files changed, 32 insertions(+)
|
||||||
|
create mode 100644 sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
create mode 100644 sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/BUILD.gn
|
||||||
|
@@ -383,6 +383,8 @@ component("sandbox_services") {
|
||||||
|
|
||||||
|
source_set("sandbox_services_headers") {
|
||||||
|
sources = [
|
||||||
|
+ "system_headers/ppc64_linux_syscalls.h",
|
||||||
|
+ "system_headers/ppc64_linux_ucontext.h",
|
||||||
|
"system_headers/arm64_linux_syscalls.h",
|
||||||
|
"system_headers/arm_linux_syscalls.h",
|
||||||
|
"system_headers/arm_linux_ucontext.h",
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_syscalls.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_syscalls.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_syscalls.h
|
||||||
|
@@ -35,5 +35,9 @@
|
||||||
|
#include "sandbox/linux/system_headers/arm64_linux_syscalls.h"
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+#include "sandbox/linux/system_headers/ppc64_linux_syscalls.h"
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_LINUX_SYSCALLS_H_
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||||
|
+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||||
|
+
|
||||||
|
+#include <asm/unistd.h>
|
||||||
|
+
|
||||||
|
+//TODO: is it necessary to redefine syscall numbers for PPC64?
|
||||||
|
+
|
||||||
|
+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||||
|
===================================================================
|
||||||
|
--- /dev/null
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_ucontext.h
|
||||||
|
@@ -0,0 +1,12 @@
|
||||||
|
+// Copyright 2014 The Chromium Authors. All rights reserved.
|
||||||
|
+// Use of this source code is governed by a BSD-style license that can be
|
||||||
|
+// found in the LICENSE file.
|
||||||
|
+
|
||||||
|
+#ifndef SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
||||||
|
+#define SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
||||||
|
+
|
||||||
|
+#include <sys/ucontext.h>
|
||||||
|
+
|
||||||
|
+//TODO: is it necessary to redefine ucontext on PPC64?
|
||||||
|
+
|
||||||
|
+#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_UCONTEXT_H_
|
@ -0,0 +1,22 @@
|
|||||||
|
From c41cd6ac927f592b161abc04468d3c7a4be91995 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Tue, 23 Oct 2018 15:49:31 -0500
|
||||||
|
Subject: [PATCH] sandbox/linux: Update IsSyscallAllowed in broker_process.cc
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/syscall_broker/broker_process.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/syscall_broker/broker_process.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/syscall_broker/broker_process.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/syscall_broker/broker_process.cc
|
||||||
|
@@ -169,7 +169,7 @@ bool BrokerProcess::IsSyscallBrokerable(
|
||||||
|
#if defined(__NR_fstatat64)
|
||||||
|
case __NR_fstatat64:
|
||||||
|
#endif
|
||||||
|
-#if defined(__x86_64__) || defined(__aarch64__)
|
||||||
|
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_newfstatat:
|
||||||
|
#endif
|
||||||
|
return !fast_check || policy_->allowed_command_set.test(COMMAND_STAT);
|
@ -0,0 +1,638 @@
|
|||||||
|
From da52663deec77f705d7d58b18484c3e28e563f10 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Tue, 18 Sep 2018 18:39:28 -0500
|
||||||
|
Subject: [PATCH] sandbox/linux: Update syscall helpers/lists for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
.../seccomp-bpf-helpers/baseline_policy.cc | 8 +-
|
||||||
|
.../syscall_parameters_restrictions.cc | 2 +-
|
||||||
|
.../syscall_parameters_restrictions.h | 2 +-
|
||||||
|
.../linux/seccomp-bpf-helpers/syscall_sets.cc | 108 ++++++++++--------
|
||||||
|
.../linux/seccomp-bpf-helpers/syscall_sets.h | 6 +-
|
||||||
|
sandbox/linux/services/syscall_wrappers.cc | 2 +-
|
||||||
|
6 files changed, 73 insertions(+), 55 deletions(-)
|
||||||
|
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/baseline_policy.cc
|
||||||
|
@@ -90,7 +90,8 @@ bool IsBaselinePolicyWatched(int sysno)
|
||||||
|
SyscallSets::IsPrctl(sysno) ||
|
||||||
|
SyscallSets::IsProcessGroupOrSession(sysno) ||
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
SyscallSets::IsSocketCall(sysno) ||
|
||||||
|
#endif
|
||||||
|
#if defined(__arm__)
|
||||||
|
@@ -255,7 +256,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
if (sysno == __NR_mmap)
|
||||||
|
return RestrictMmapFlags();
|
||||||
|
#endif
|
||||||
|
@@ -276,7 +277,7 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||||
|
return RestrictPrctl();
|
||||||
|
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
if (sysno == __NR_socketpair) {
|
||||||
|
// Only allow AF_UNIX, PF_UNIX. Crash if anything else is seen.
|
||||||
|
static_assert(AF_UNIX == PF_UNIX,
|
||||||
|
@@ -340,7 +341,8 @@ ResultExpr EvaluateSyscallImpl(int fs_de
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
if (SyscallSets::IsSocketCall(sysno))
|
||||||
|
return RestrictSocketcallCommand();
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.cc
|
||||||
|
@@ -36,7 +36,7 @@
|
||||||
|
#include "sandbox/linux/system_headers/linux_time.h"
|
||||||
|
|
||||||
|
#if (BUILDFLAG(IS_LINUX) || BUILDFLAG(IS_CHROMEOS_LACROS)) && \
|
||||||
|
- !defined(__arm__) && !defined(__aarch64__) && \
|
||||||
|
+ !defined(__arm__) && !defined(__aarch64__) && !defined(__powerpc64__) && \
|
||||||
|
!defined(PTRACE_GET_THREAD_AREA)
|
||||||
|
// Also include asm/ptrace-abi.h since ptrace.h in older libc (for instance
|
||||||
|
// the one in Ubuntu 16.04 LTS) is missing PTRACE_GET_THREAD_AREA.
|
||||||
|
@@ -45,6 +45,11 @@
|
||||||
|
#include <asm/ptrace-abi.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
|
||||||
|
+#ifdef __powerpc64__
|
||||||
|
+#include <termios.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#if BUILDFLAG(IS_ANDROID)
|
||||||
|
|
||||||
|
#if !defined(F_DUPFD_CLOEXEC)
|
||||||
|
@@ -102,6 +107,15 @@ inline bool IsArchitectureMips() {
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
+inline bool IsArchitecturePPC64() {
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ return true;
|
||||||
|
+#else
|
||||||
|
+ return false;
|
||||||
|
+#endif
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+
|
||||||
|
// Ubuntu's version of glibc has a race condition in sem_post that can cause
|
||||||
|
// it to call futex(2) with bogus op arguments. To workaround this, we need
|
||||||
|
// to allow those futex(2) calls to fail with EINVAL, instead of crashing the
|
||||||
|
@@ -269,9 +283,11 @@ ResultExpr RestrictFcntlCommands() {
|
||||||
|
// operator.
|
||||||
|
// Glibc overrides the kernel's O_LARGEFILE value. Account for this.
|
||||||
|
uint64_t kOLargeFileFlag = O_LARGEFILE;
|
||||||
|
- if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips())
|
||||||
|
+ if (IsArchitectureX86_64() || IsArchitectureI386() || IsArchitectureMips() \
|
||||||
|
+ || IsArchitecturePPC64())
|
||||||
|
kOLargeFileFlag = 0100000;
|
||||||
|
|
||||||
|
+
|
||||||
|
const Arg<int> cmd(1);
|
||||||
|
const Arg<long> long_arg(2);
|
||||||
|
|
||||||
|
@@ -294,8 +310,17 @@ ResultExpr RestrictFcntlCommands() {
|
||||||
|
F_SETLKW,
|
||||||
|
F_GETLK,
|
||||||
|
F_DUPFD,
|
||||||
|
- F_DUPFD_CLOEXEC},
|
||||||
|
- Allow())
|
||||||
|
+ F_DUPFD_CLOEXEC
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+// On PPC64, F_SETLK, F_GETLK, F_SETLKW are defined as the 64-bit variants
|
||||||
|
+// but glibc will sometimes still use the 32-bit versions. Allow both.
|
||||||
|
+ ,
|
||||||
|
+ 5, /* F_GETLK (32) */
|
||||||
|
+ 6, /* F_SETLK (32) */
|
||||||
|
+ 7 /* F_SETLKW (32) */
|
||||||
|
+#endif
|
||||||
|
+ },
|
||||||
|
+ Allow())
|
||||||
|
.Case(F_SETFL,
|
||||||
|
If((long_arg & ~kAllowedMask) == 0, Allow()).Else(CrashSIGSYS()))
|
||||||
|
.Case(F_ADD_SEALS,
|
||||||
|
@@ -304,7 +329,7 @@ ResultExpr RestrictFcntlCommands() {
|
||||||
|
// clang-format on
|
||||||
|
}
|
||||||
|
|
||||||
|
-#if defined(__i386__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
|
||||||
|
ResultExpr RestrictSocketcallCommand() {
|
||||||
|
// Unfortunately, we are unable to restrict the first parameter to
|
||||||
|
// socketpair(2). Whilst initially sounding bad, it's noteworthy that very
|
||||||
|
@@ -463,7 +488,7 @@ ResultExpr RestrictPtrace() {
|
||||||
|
#endif
|
||||||
|
return Switch(request)
|
||||||
|
.Cases({
|
||||||
|
-#if !defined(__aarch64__)
|
||||||
|
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
||||||
|
PTRACE_GETREGS, PTRACE_GETFPREGS, PTRACE_GET_THREAD_AREA,
|
||||||
|
PTRACE_GETREGSET,
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_parameters_restrictions.h
|
||||||
|
@@ -52,7 +52,7 @@ SANDBOX_EXPORT bpf_dsl::ResultExpr Restr
|
||||||
|
// O_NONBLOCK | O_SYNC | O_LARGEFILE | O_CLOEXEC | O_NOATIME.
|
||||||
|
SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictFcntlCommands();
|
||||||
|
|
||||||
|
-#if defined(__i386__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__mips__) || defined(__powerpc64__)
|
||||||
|
// Restrict socketcall(2) to only allow socketpair(2), send(2), recv(2),
|
||||||
|
// sendto(2), recvfrom(2), shutdown(2), sendmsg(2) and recvmsg(2).
|
||||||
|
SANDBOX_EXPORT bpf_dsl::ResultExpr RestrictSocketcallCommand();
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -29,7 +29,8 @@ bool SyscallSets::IsAllowedGettime(int s
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_gettimeofday:
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_time:
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
@@ -52,12 +53,14 @@ bool SyscallSets::IsAllowedGettime(int s
|
||||||
|
case __NR_clock_nanosleep_time64: // Parameters filtered by RestrictClockID().
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_ftime: // Obsolete.
|
||||||
|
#endif
|
||||||
|
case __NR_settimeofday: // Privileged.
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_stime:
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
@@ -136,7 +139,7 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||||
|
case __NR_faccessat2:
|
||||||
|
case __NR_fchmodat:
|
||||||
|
case __NR_fchownat: // Should be called chownat ?
|
||||||
|
-#if defined(__x86_64__) || defined(__aarch64__)
|
||||||
|
+#if defined(__x86_64__) || defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_newfstatat: // fstatat(). EPERM not a valid errno.
|
||||||
|
#elif defined(__i386__) || defined(__arm__) || \
|
||||||
|
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
@@ -155,7 +158,7 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||||
|
case __NR_memfd_create:
|
||||||
|
case __NR_mkdirat:
|
||||||
|
case __NR_mknodat:
|
||||||
|
-#if defined(__i386__)
|
||||||
|
+#if defined(__i386__) || defined(__powerpc64__)
|
||||||
|
case __NR_oldlstat:
|
||||||
|
case __NR_oldstat:
|
||||||
|
#endif
|
||||||
|
@@ -169,7 +172,8 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||||
|
#endif
|
||||||
|
case __NR_statfs: // EPERM not a valid errno.
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_statfs64:
|
||||||
|
#endif
|
||||||
|
case __NR_statx: // EPERM not a valid errno.
|
||||||
|
@@ -180,7 +184,8 @@ bool SyscallSets::IsFileSystem(int sysno
|
||||||
|
case __NR_truncate64:
|
||||||
|
#endif
|
||||||
|
case __NR_unlinkat:
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_utime:
|
||||||
|
#endif
|
||||||
|
case __NR_utimensat: // New.
|
||||||
|
@@ -220,7 +225,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
// TODO(jln): these should be denied gracefully as well (moved below).
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_fadvise64: // EPERM not a valid errno.
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__)
|
||||||
|
@@ -233,11 +239,12 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||||
|
case __NR_flock: // EPERM not a valid errno.
|
||||||
|
case __NR_fstatfs: // Give information about the whole filesystem.
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_fstatfs64:
|
||||||
|
#endif
|
||||||
|
case __NR_fsync: // EPERM not a valid errno.
|
||||||
|
-#if defined(__i386__)
|
||||||
|
+#if defined(__i386__) || defined(__powerpc64__)
|
||||||
|
case __NR_oldfstat:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
@@ -245,6 +252,8 @@ bool SyscallSets::IsAllowedFileSystemAcc
|
||||||
|
case __NR_sync_file_range: // EPERM not a valid errno.
|
||||||
|
#elif defined(__arm__)
|
||||||
|
case __NR_arm_sync_file_range: // EPERM not a valid errno.
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ case __NR_sync_file_range2: // EPERM not a valid errno.
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
return false;
|
||||||
|
@@ -265,7 +274,8 @@ bool SyscallSets::IsDeniedFileSystemAcce
|
||||||
|
#endif
|
||||||
|
case __NR_getdents64: // EPERM not a valid errno.
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_readdir:
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
@@ -306,7 +316,7 @@ bool SyscallSets::IsGetSimpleId(int sysn
|
||||||
|
bool SyscallSets::IsProcessPrivilegeChange(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_capset:
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
|
||||||
|
case __NR_ioperm: // Intel privilege.
|
||||||
|
case __NR_iopl: // Intel privilege.
|
||||||
|
#endif
|
||||||
|
@@ -362,7 +372,8 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||||
|
// overflow.
|
||||||
|
case __NR_sigaltstack:
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_rt_sigtimedwait_time64:
|
||||||
|
case __NR_sigaction:
|
||||||
|
case __NR_sigprocmask:
|
||||||
|
@@ -378,7 +389,8 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||||
|
#endif
|
||||||
|
case __NR_signalfd4:
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_sigpending:
|
||||||
|
case __NR_sigsuspend:
|
||||||
|
#endif
|
||||||
|
@@ -402,7 +414,7 @@ bool SyscallSets::IsAllowedOperationOnFd
|
||||||
|
#endif
|
||||||
|
case __NR_dup3:
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_shutdown:
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
@@ -435,7 +447,7 @@ bool SyscallSets::IsAllowedProcessStartO
|
||||||
|
case __NR_exit_group:
|
||||||
|
case __NR_wait4:
|
||||||
|
case __NR_waitid:
|
||||||
|
-#if defined(__i386__)
|
||||||
|
+#if defined(__i386__) || defined(__powerpc64__)
|
||||||
|
case __NR_waitpid:
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
@@ -452,7 +464,7 @@ bool SyscallSets::IsAllowedProcessStartO
|
||||||
|
#endif
|
||||||
|
case __NR_set_tid_address:
|
||||||
|
case __NR_unshare:
|
||||||
|
-#if !defined(__mips__) && !defined(__aarch64__)
|
||||||
|
+#if !defined(__mips__) && !defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_vfork:
|
||||||
|
#endif
|
||||||
|
default:
|
||||||
|
@@ -499,7 +511,7 @@ bool SyscallSets::IsAllowedEpoll(int sys
|
||||||
|
bool SyscallSets::IsDeniedGetOrModifySocket(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_accept:
|
||||||
|
case __NR_accept4:
|
||||||
|
case __NR_bind:
|
||||||
|
@@ -514,7 +526,8 @@ bool SyscallSets::IsDeniedGetOrModifySoc
|
||||||
|
}
|
||||||
|
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// Big multiplexing system call for sockets.
|
||||||
|
bool SyscallSets::IsSocketCall(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
@@ -528,7 +541,8 @@ bool SyscallSets::IsSocketCall(int sysno
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
-#if defined(__x86_64__) || defined(__arm__) || defined(__mips__)
|
||||||
|
+#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
bool SyscallSets::IsNetworkSocketInformation(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_getpeername:
|
||||||
|
@@ -554,7 +568,7 @@ bool SyscallSets::IsAllowedAddressSpaceA
|
||||||
|
case __NR_mincore:
|
||||||
|
case __NR_mlockall:
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_mmap:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
@@ -584,7 +598,8 @@ bool SyscallSets::IsAllowedGeneralIo(int
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_lseek:
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR__llseek:
|
||||||
|
#endif
|
||||||
|
#if !defined(__aarch64__)
|
||||||
|
@@ -604,26 +619,28 @@ bool SyscallSets::IsAllowedGeneralIo(int
|
||||||
|
case __NR_readv:
|
||||||
|
case __NR_pread64:
|
||||||
|
#if defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_recv:
|
||||||
|
#endif
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_recvfrom: // Could specify source.
|
||||||
|
case __NR_recvmsg: // Could specify source.
|
||||||
|
#endif
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__powerpc64__)
|
||||||
|
case __NR_select:
|
||||||
|
#endif
|
||||||
|
-#if defined(__i386__) || defined(__arm__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__arm__) || defined(__mips__) || defined(__powerpc64__)
|
||||||
|
case __NR__newselect:
|
||||||
|
#endif
|
||||||
|
#if defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_send:
|
||||||
|
#endif
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_sendmsg: // Could specify destination.
|
||||||
|
case __NR_sendto: // Could specify destination.
|
||||||
|
#endif
|
||||||
|
@@ -679,7 +696,8 @@ bool SyscallSets::IsAllowedBasicSchedule
|
||||||
|
return true;
|
||||||
|
case __NR_getpriority:
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_nice:
|
||||||
|
#endif
|
||||||
|
case __NR_setpriority:
|
||||||
|
@@ -691,7 +709,8 @@ bool SyscallSets::IsAllowedBasicSchedule
|
||||||
|
bool SyscallSets::IsAdminOperation(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_bdflush:
|
||||||
|
#endif
|
||||||
|
case __NR_kexec_load:
|
||||||
|
@@ -707,7 +726,8 @@ bool SyscallSets::IsAdminOperation(int s
|
||||||
|
|
||||||
|
bool SyscallSets::IsKernelModule(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_create_module:
|
||||||
|
case __NR_get_kernel_syms: // Should ENOSYS.
|
||||||
|
case __NR_query_module:
|
||||||
|
@@ -740,7 +760,8 @@ bool SyscallSets::IsFsControl(int sysno)
|
||||||
|
case __NR_swapoff:
|
||||||
|
case __NR_swapon:
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_umount:
|
||||||
|
#endif
|
||||||
|
case __NR_umount2:
|
||||||
|
@@ -756,7 +777,7 @@ bool SyscallSets::IsNuma(int sysno) {
|
||||||
|
case __NR_getcpu:
|
||||||
|
case __NR_mbind:
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_migrate_pages:
|
||||||
|
#endif
|
||||||
|
case __NR_move_pages:
|
||||||
|
@@ -791,14 +812,15 @@ bool SyscallSets::IsGlobalProcessEnviron
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_acct: // Privileged.
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_getrlimit:
|
||||||
|
#endif
|
||||||
|
-#if defined(__i386__) || defined(__arm__)
|
||||||
|
+#if defined(__i386__) || defined(__arm__) || defined(__powerpc64__)
|
||||||
|
case __NR_ugetrlimit:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_ulimit:
|
||||||
|
#endif
|
||||||
|
case __NR_getrusage:
|
||||||
|
@@ -832,7 +854,7 @@ bool SyscallSets::IsGlobalSystemStatus(i
|
||||||
|
#endif
|
||||||
|
case __NR_sysinfo:
|
||||||
|
case __NR_uname:
|
||||||
|
-#if defined(__i386__)
|
||||||
|
+#if defined(__i386__) || defined(__powerpc64__)
|
||||||
|
case __NR_olduname:
|
||||||
|
case __NR_oldolduname:
|
||||||
|
#endif
|
||||||
|
@@ -916,7 +938,8 @@ bool SyscallSets::IsSystemVSemaphores(in
|
||||||
|
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||||
|
defined(__aarch64__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// These give a lot of ambient authority and bypass the setuid sandbox.
|
||||||
|
bool SyscallSets::IsSystemVSharedMemory(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
@@ -947,7 +970,8 @@ bool SyscallSets::IsSystemVMessageQueue(
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// Big system V multiplexing system call.
|
||||||
|
bool SyscallSets::IsSystemVIpc(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
@@ -967,7 +991,8 @@ bool SyscallSets::IsAnySystemV(int sysno
|
||||||
|
return IsSystemVMessageQueue(sysno) || IsSystemVSemaphores(sysno) ||
|
||||||
|
IsSystemVSharedMemory(sysno);
|
||||||
|
#elif defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
return IsSystemVIpc(sysno);
|
||||||
|
#endif
|
||||||
|
}
|
||||||
|
@@ -1024,7 +1049,8 @@ bool SyscallSets::IsFaNotify(int sysno)
|
||||||
|
bool SyscallSets::IsTimer(int sysno) {
|
||||||
|
switch (sysno) {
|
||||||
|
case __NR_getitimer:
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_alarm:
|
||||||
|
#endif
|
||||||
|
case __NR_setitimer:
|
||||||
|
@@ -1103,18 +1129,22 @@ bool SyscallSets::IsMisc(int sysno) {
|
||||||
|
case __NR_syncfs:
|
||||||
|
case __NR_vhangup:
|
||||||
|
// The system calls below are not implemented.
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_afs_syscall:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_break:
|
||||||
|
#endif
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_getpmsg:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_gtty:
|
||||||
|
case __NR_idle:
|
||||||
|
case __NR_lock:
|
||||||
|
@@ -1122,20 +1152,22 @@ bool SyscallSets::IsMisc(int sysno) {
|
||||||
|
case __NR_prof:
|
||||||
|
case __NR_profil:
|
||||||
|
#endif
|
||||||
|
-#if defined(__i386__) || defined(__x86_64__) || defined(__mips__)
|
||||||
|
+#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_putpmsg:
|
||||||
|
#endif
|
||||||
|
#if defined(__x86_64__)
|
||||||
|
case __NR_security:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
case __NR_stty:
|
||||||
|
#endif
|
||||||
|
-#if defined(__x86_64__)
|
||||||
|
+#if defined(__x86_64__) || defined(__powerpc64__)
|
||||||
|
case __NR_tuxcall:
|
||||||
|
#endif
|
||||||
|
-#if !defined(__aarch64__)
|
||||||
|
+#if !defined(__aarch64__) && !defined(__powerpc64__)
|
||||||
|
case __NR_vserver:
|
||||||
|
#endif
|
||||||
|
return true;
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/syscall_sets.h
|
||||||
|
@@ -46,13 +46,14 @@ class SANDBOX_EXPORT SyscallSets {
|
||||||
|
static bool IsDeniedGetOrModifySocket(int sysno);
|
||||||
|
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// Big multiplexing system call for sockets.
|
||||||
|
static bool IsSocketCall(int sysno);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__x86_64__) || defined(__arm__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
static bool IsNetworkSocketInformation(int sysno);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -84,7 +85,8 @@ class SANDBOX_EXPORT SyscallSets {
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||||
|
defined(__aarch64__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_64_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// These give a lot of ambient authority and bypass the setuid sandbox.
|
||||||
|
static bool IsSystemVSharedMemory(int sysno);
|
||||||
|
#endif
|
||||||
|
@@ -95,7 +97,8 @@ class SANDBOX_EXPORT SyscallSets {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
- (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS))
|
||||||
|
+ (defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
+ defined(__powerpc64__)
|
||||||
|
// Big system V multiplexing system call.
|
||||||
|
static bool IsSystemVIpc(int sysno);
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/services/syscall_wrappers.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/services/syscall_wrappers.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/services/syscall_wrappers.cc
|
||||||
|
@@ -61,7 +61,7 @@ long sys_clone(unsigned long flags,
|
||||||
|
#if defined(ARCH_CPU_X86_64)
|
||||||
|
return syscall(__NR_clone, flags, child_stack, ptid, ctid, tls);
|
||||||
|
#elif defined(ARCH_CPU_X86) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||||
|
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||||
|
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
|
||||||
|
// CONFIG_CLONE_BACKWARDS defined.
|
||||||
|
return syscall(__NR_clone, flags, child_stack, ptid, tls, ctid);
|
||||||
|
#endif
|
@ -0,0 +1,27 @@
|
|||||||
|
From c9043a422fb4a5a6c72aaa1b907cea5f6a3061dd Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 19:10:24 -0500
|
||||||
|
Subject: [PATCH 1/4] sandbox/linux/bpf_dsl: Update syscall ranges for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/bpf_dsl/linux_syscall_ranges.h | 7 +++++++
|
||||||
|
1 file changed, 7 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
@@ -56,6 +56,13 @@
|
||||||
|
#define MAX_PUBLIC_SYSCALL __NR_syscalls
|
||||||
|
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||||
|
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+
|
||||||
|
+#include <asm/unistd.h>
|
||||||
|
+#define MIN_SYSCALL 0u
|
||||||
|
+#define MAX_PUBLIC_SYSCALL 386u
|
||||||
|
+#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
#error "Unsupported architecture"
|
||||||
|
#endif
|
@ -0,0 +1,26 @@
|
|||||||
|
From 7468b266532bd607eb1f5292d758256d800b2eee Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Fri, 10 Aug 2018 00:23:50 -0500
|
||||||
|
Subject: [PATCH] services/service_manager/sandbox/linux: Fix TCGETS
|
||||||
|
declaration on PPC64
|
||||||
|
|
||||||
|
---
|
||||||
|
.../sandbox/linux/bpf_renderer_policy_linux.cc | 5 +++++
|
||||||
|
1 file changed, 5 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
@@ -15,6 +15,11 @@
|
||||||
|
#include "sandbox/linux/system_headers/linux_syscalls.h"
|
||||||
|
#include "sandbox/policy/linux/sandbox_linux.h"
|
||||||
|
|
||||||
|
+// On PPC64, TCGETS is defined in terms of struct termios, so we must include termios.h
|
||||||
|
+#ifdef __powerpc64__
|
||||||
|
+#include <termios.h>
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// TODO(vignatti): replace the local definitions below with #include
|
||||||
|
// <linux/dma-buf.h> once kernel version 4.6 becomes widely used.
|
||||||
|
#include <linux/types.h>
|
@ -0,0 +1,11 @@
|
|||||||
|
--- a/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||||
|
+++ b/third_party/swiftshader/third_party/llvm-10.0/BUILD.gn
|
||||||
|
@@ -1258,6 +1258,8 @@
|
||||||
|
"llvm/lib/Target/PowerPC/PPCVSXFMAMutate.cpp",
|
||||||
|
"llvm/lib/Target/PowerPC/PPCVSXSwapRemoval.cpp",
|
||||||
|
"llvm/lib/Target/PowerPC/TargetInfo/PowerPCTargetInfo.cpp",
|
||||||
|
+ "llvm/lib/MC/MCXCOFFObjectTargetWriter.cpp",
|
||||||
|
+ "llvm/lib/MC/MCAsmInfoXCOFF.cpp",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,12 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/angle/src/libANGLE/Constants.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/angle/src/libANGLE/Constants.h
|
||||||
|
+++ chromium-128.0.6613.113/third_party/angle/src/libANGLE/Constants.h
|
||||||
|
@@ -9,6 +9,7 @@
|
||||||
|
#ifndef LIBANGLE_CONSTANTS_H_
|
||||||
|
#define LIBANGLE_CONSTANTS_H_
|
||||||
|
|
||||||
|
+#include <cstddef>
|
||||||
|
#include "common/platform.h"
|
||||||
|
|
||||||
|
#include <stddef.h>
|
@ -0,0 +1,23 @@
|
|||||||
|
From cc613c2e3bac8d4d1ff153700b819f964435923a Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Tue, 4 Sep 2018 18:16:07 -0500
|
||||||
|
Subject: [PATCH] third_party/libvpx: Properly generate gni on ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
third_party/libvpx/BUILD.gn | 2 ++
|
||||||
|
third_party/libvpx/generate_gni.sh | 10 ++++++++++
|
||||||
|
2 files changed, 12 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/third_party/libvpx/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libvpx/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libvpx/BUILD.gn
|
||||||
|
@@ -320,6 +320,8 @@ if (current_cpu == "x86" || (current_cpu
|
||||||
|
} else if (current_cpu == "x64") {
|
||||||
|
deps = [ ":libvpx_x86_64_headers" ]
|
||||||
|
sources = libvpx_srcs_x86_64_avx512
|
||||||
|
+ } else if (current_cpu == "ppc64") {
|
||||||
|
+ sources = libvpx_srcs_ppc64
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,22 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/lss/linux_syscall_support.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/lss/linux_syscall_support.h
|
||||||
|
+++ chromium-128.0.6613.113/third_party/lss/linux_syscall_support.h
|
||||||
|
@@ -4638,7 +4638,7 @@ struct kernel_statx {
|
||||||
|
LSS_REG(2, buf);
|
||||||
|
LSS_BODY(void*, mmap2, "0"(__r2));
|
||||||
|
}
|
||||||
|
-#else
|
||||||
|
+#elif !defined(__powerpc64__) /* ppc64 doesn't have mmap2 */
|
||||||
|
#define __NR__mmap2 __NR_mmap2
|
||||||
|
LSS_INLINE _syscall6(void*, _mmap2, void*, s,
|
||||||
|
size_t, l, int, p,
|
||||||
|
@@ -4749,7 +4749,7 @@ struct kernel_statx {
|
||||||
|
#if defined(__i386__) || \
|
||||||
|
defined(__ARM_ARCH_3__) || defined(__ARM_EABI__) || \
|
||||||
|
(defined(__mips__) && _MIPS_SIM == _MIPS_SIM_ABI32) || \
|
||||||
|
- defined(__PPC__) || \
|
||||||
|
+ (defined(__PPC__) && !defined(__powerpc64__)) || \
|
||||||
|
(defined(__s390__) && !defined(__s390x__))
|
||||||
|
/* On these architectures, implement mmap() with mmap2(). */
|
||||||
|
LSS_INLINE void* LSS_NAME(mmap)(void *s, size_t l, int p, int f, int d,
|
@ -0,0 +1,22 @@
|
|||||||
|
From 63e63a70766f3059ce5f1d06a95988ecf909b298 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawn@anastas.io>
|
||||||
|
Date: Wed, 24 Apr 2019 21:17:23 -0500
|
||||||
|
Subject: [PATCH] third_party/pffft: Include altivec.h on ppc64 with SIMD
|
||||||
|
enabled
|
||||||
|
|
||||||
|
---
|
||||||
|
third_party/pffft/src/pffft.c | 1 +
|
||||||
|
1 file changed, 1 insertion(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/third_party/pffft/src/pffft.c
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/pffft/src/pffft.c
|
||||||
|
+++ chromium-128.0.6613.113/third_party/pffft/src/pffft.c
|
||||||
|
@@ -100,6 +100,7 @@
|
||||||
|
Altivec support macros
|
||||||
|
*/
|
||||||
|
#if !defined(PFFFT_SIMD_DISABLE) && (defined(__ppc__) || defined(__ppc64__))
|
||||||
|
+#include <altivec.h>
|
||||||
|
typedef vector float v4sf;
|
||||||
|
# define SIMD_SZ 4
|
||||||
|
# define VZERO() ((vector float) vec_splat_u8(0))
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,18 @@
|
|||||||
|
Index: chromium-128.0.6613.113/v8/src/base/immediate-crash.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/v8/src/base/immediate-crash.h
|
||||||
|
+++ chromium-128.0.6613.113/v8/src/base/immediate-crash.h
|
||||||
|
@@ -98,6 +98,13 @@
|
||||||
|
#define TRAP_SEQUENCE1_() asm volatile(".2byte 0x0001");
|
||||||
|
#define TRAP_SEQUENCE2_() asm volatile("")
|
||||||
|
|
||||||
|
+#elif V8_HOST_ARCH_PPC64
|
||||||
|
+
|
||||||
|
+#define TRAP_SEQUENCE1_() asm volatile("trap")
|
||||||
|
+// Intentionally empty: __builtin_unreachable() is always part of the sequence
|
||||||
|
+// (see IMMEDIATE_CRASH below)
|
||||||
|
+#define TRAP_SEQUENCE2_() asm volatile("")
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
|
||||||
|
// Crash report accuracy will not be guaranteed on other architectures, but at
|
@ -0,0 +1,21 @@
|
|||||||
|
From 82922bf486e9926a171152f61030dfcd53f017b8 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Timothy Pearson <tpearson@raptorengineering.com>
|
||||||
|
Date: Thu, 30 Aug 2018 17:32:05 -0500
|
||||||
|
Subject: [PATCH] Include cstddef to fix build
|
||||||
|
|
||||||
|
size_t is not defined unless cstddef is included.
|
||||||
|
---
|
||||||
|
third_party/crashpad/crashpad/compat/linux/sys/user.h | 1 +
|
||||||
|
|
||||||
|
Index: chromium-127.0.6533.72/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-127.0.6533.72.orig/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||||
|
+++ chromium-127.0.6533.72/third_party/crashpad/crashpad/compat/linux/sys/user.h
|
||||||
|
@@ -15,6 +15,7 @@
|
||||||
|
#ifndef CRASHPAD_COMPAT_LINUX_SYS_USER_H_
|
||||||
|
#define CRASHPAD_COMPAT_LINUX_SYS_USER_H_
|
||||||
|
|
||||||
|
+#include <cstddef>
|
||||||
|
#include_next <sys/user.h>
|
||||||
|
|
||||||
|
#include <features.h>
|
@ -0,0 +1,76 @@
|
|||||||
|
From 3c4705bfdda45feb860a1f121631773e5fe8e53f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 19:11:26 -0500
|
||||||
|
Subject: [PATCH 1/4] sandbox/linux/bpf_dsl: Modify seccomp_macros to add
|
||||||
|
support for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/bpf_dsl/seccomp_macros.h | 43 ++++++++++++++++++++++++++
|
||||||
|
1 file changed, 43 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/bpf_dsl/seccomp_macros.h
|
||||||
|
@@ -14,6 +14,9 @@
|
||||||
|
#if defined(__mips__)
|
||||||
|
// sys/user.h in eglibc misses size_t definition
|
||||||
|
#include <stddef.h>
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+// Manually define greg_t on ppc64
|
||||||
|
+typedef unsigned long long greg_t;
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
|
|
||||||
|
@@ -343,6 +346,51 @@ struct regs_struct {
|
||||||
|
#define SECCOMP_PT_PARM4(_regs) (_regs).regs[3]
|
||||||
|
#define SECCOMP_PT_PARM5(_regs) (_regs).regs[4]
|
||||||
|
#define SECCOMP_PT_PARM6(_regs) (_regs).regs[5]
|
||||||
|
+
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+#include <asm/ptrace.h>
|
||||||
|
+
|
||||||
|
+typedef struct pt_regs regs_struct;
|
||||||
|
+
|
||||||
|
+#ifdef ARCH_CPU_LITTLE_ENDIAN
|
||||||
|
+#define SECCOMP_ARCH AUDIT_ARCH_PPC64LE
|
||||||
|
+#else
|
||||||
|
+#define SECCOMP_ARCH AUDIT_ARCH_PPC64
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+#define SECCOMP_REG(_ctx, _reg) ((_ctx)->uc_mcontext.regs->gpr[_reg])
|
||||||
|
+
|
||||||
|
+#define SECCOMP_RESULT(_ctx) SECCOMP_REG(_ctx, 3)
|
||||||
|
+#define SECCOMP_SYSCALL(_ctx) SECCOMP_REG(_ctx, 0)
|
||||||
|
+#define SECCOMP_IP(_ctx) (_ctx)->uc_mcontext.regs->nip
|
||||||
|
+#define SECCOMP_PARM1(_ctx) SECCOMP_REG(_ctx, 3)
|
||||||
|
+#define SECCOMP_PARM2(_ctx) SECCOMP_REG(_ctx, 4)
|
||||||
|
+#define SECCOMP_PARM3(_ctx) SECCOMP_REG(_ctx, 5)
|
||||||
|
+#define SECCOMP_PARM4(_ctx) SECCOMP_REG(_ctx, 6)
|
||||||
|
+#define SECCOMP_PARM5(_ctx) SECCOMP_REG(_ctx, 7)
|
||||||
|
+#define SECCOMP_PARM6(_ctx) SECCOMP_REG(_ctx, 8)
|
||||||
|
+
|
||||||
|
+#define SECCOMP_NR_IDX (offsetof(struct arch_seccomp_data, nr))
|
||||||
|
+#define SECCOMP_ARCH_IDX (offsetof(struct arch_seccomp_data, arch))
|
||||||
|
+#define SECCOMP_IP_MSB_IDX \
|
||||||
|
+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 4)
|
||||||
|
+#define SECCOMP_IP_LSB_IDX \
|
||||||
|
+ (offsetof(struct arch_seccomp_data, instruction_pointer) + 0)
|
||||||
|
+#define SECCOMP_ARG_MSB_IDX(nr) \
|
||||||
|
+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 4)
|
||||||
|
+#define SECCOMP_ARG_LSB_IDX(nr) \
|
||||||
|
+ (offsetof(struct arch_seccomp_data, args) + 8 * (nr) + 0)
|
||||||
|
+
|
||||||
|
+#define SECCOMP_PT_RESULT(_regs) (_regs).gpr[3]
|
||||||
|
+#define SECCOMP_PT_SYSCALL(_regs) (_regs).gpr[0]
|
||||||
|
+#define SECCOMP_PT_IP(_regs) (_regs).nip
|
||||||
|
+#define SECCOMP_PT_PARM1(_regs) (_regs).gpr[3]
|
||||||
|
+#define SECCOMP_PT_PARM2(_regs) (_regs).gpr[4]
|
||||||
|
+#define SECCOMP_PT_PARM3(_regs) (_regs).gpr[5]
|
||||||
|
+#define SECCOMP_PT_PARM4(_regs) (_regs).gpr[6]
|
||||||
|
+#define SECCOMP_PT_PARM5(_regs) (_regs).gpr[7]
|
||||||
|
+#define SECCOMP_PT_PARM6(_regs) (_regs).gpr[8]
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
#error Unsupported target platform
|
||||||
|
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,168 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/lss/linux_syscall_support.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/lss/linux_syscall_support.h
|
||||||
|
+++ chromium-128.0.6613.113/third_party/lss/linux_syscall_support.h
|
||||||
|
@@ -87,7 +87,7 @@
|
||||||
|
* Porting to other related platforms should not be difficult.
|
||||||
|
*/
|
||||||
|
#if (defined(__i386__) || defined(__x86_64__) || defined(__ARM_ARCH_3__) || \
|
||||||
|
- defined(__mips__) || defined(__PPC__) || defined(__ARM_EABI__) || \
|
||||||
|
+ defined(__mips__) || defined(__PPC__) || defined(__powerpc64__) || defined(__ARM_EABI__) || \
|
||||||
|
defined(__aarch64__) || defined(__s390__) || defined(__e2k__) || \
|
||||||
|
(defined(__riscv) && __riscv_xlen == 64) || defined(__loongarch_lp64)) \
|
||||||
|
&& (defined(__linux) || defined(__ANDROID__))
|
||||||
|
@@ -399,7 +399,7 @@ struct kernel_stat64 {
|
||||||
|
unsigned __pad2;
|
||||||
|
unsigned long long st_blocks;
|
||||||
|
};
|
||||||
|
-#elif defined __PPC__
|
||||||
|
+#elif defined __PPC__ && !defined(__powerpc64__)
|
||||||
|
struct kernel_stat64 {
|
||||||
|
unsigned long long st_dev;
|
||||||
|
unsigned long long st_ino;
|
||||||
|
@@ -421,6 +421,28 @@ struct kernel_stat64 {
|
||||||
|
unsigned long __unused4;
|
||||||
|
unsigned long __unused5;
|
||||||
|
};
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+struct kernel_stat64 {
|
||||||
|
+ unsigned long int st_dev;
|
||||||
|
+ unsigned long int st_ino;
|
||||||
|
+ unsigned int st_mode;
|
||||||
|
+ unsigned long int st_nlink;
|
||||||
|
+ unsigned int st_uid;
|
||||||
|
+ unsigned int st_gid;
|
||||||
|
+ unsigned long int st_rdev;
|
||||||
|
+ unsigned short int __pad2;
|
||||||
|
+ long int st_size;
|
||||||
|
+ long int st_blksize;
|
||||||
|
+ long int st_blocks;
|
||||||
|
+ long int st_atime_;
|
||||||
|
+ unsigned long int st_atime_nsec_;
|
||||||
|
+ long int st_mtime_;
|
||||||
|
+ unsigned long int st_mtime_nsec_;
|
||||||
|
+ long int st_ctime_;
|
||||||
|
+ unsigned long int st_ctime_nsec_;
|
||||||
|
+ unsigned long int __unused4;
|
||||||
|
+ unsigned long int __unused5;
|
||||||
|
+};
|
||||||
|
#elif defined(__e2k__)
|
||||||
|
struct kernel_stat64 {
|
||||||
|
unsigned long long st_dev;
|
||||||
|
@@ -537,7 +559,7 @@ struct kernel_stat {
|
||||||
|
uint64_t st_ctime_nsec_;
|
||||||
|
int64_t __unused4[3];
|
||||||
|
};
|
||||||
|
-#elif defined(__PPC__)
|
||||||
|
+#elif defined(__PPC__) && !defined(__powerpc64__)
|
||||||
|
typedef unsigned long kernel_blkcnt_t;
|
||||||
|
typedef unsigned long kernel_blksize_t;
|
||||||
|
typedef unsigned kernel_dev_t;
|
||||||
|
@@ -568,6 +590,37 @@ struct kernel_stat {
|
||||||
|
unsigned long __unused4;
|
||||||
|
unsigned long __unused5;
|
||||||
|
};
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+typedef long int kernel_blkcnt_t;
|
||||||
|
+typedef long int kernel_blksize_t;
|
||||||
|
+typedef unsigned long int kernel_dev_t;
|
||||||
|
+typedef unsigned int kernel_gid_t;
|
||||||
|
+typedef unsigned long int kernel_ino_t;
|
||||||
|
+typedef unsigned int kernel_mode_t;
|
||||||
|
+typedef unsigned long int kernel_nlink_t;
|
||||||
|
+typedef long int kernel_off_t;
|
||||||
|
+typedef long int kernel_time_t;
|
||||||
|
+typedef unsigned int kernel_uid_t;
|
||||||
|
+struct kernel_stat {
|
||||||
|
+ kernel_dev_t st_dev;
|
||||||
|
+ kernel_ino_t st_ino;
|
||||||
|
+ kernel_mode_t st_mode;
|
||||||
|
+ kernel_nlink_t st_nlink;
|
||||||
|
+ kernel_uid_t st_uid;
|
||||||
|
+ kernel_gid_t st_gid;
|
||||||
|
+ kernel_dev_t st_rdev;
|
||||||
|
+ kernel_off_t st_size;
|
||||||
|
+ kernel_blksize_t st_blksize;
|
||||||
|
+ kernel_blkcnt_t st_blocks;
|
||||||
|
+ kernel_time_t st_atime_;
|
||||||
|
+ unsigned long int st_atime_nsec_;
|
||||||
|
+ kernel_time_t st_mtime_;
|
||||||
|
+ unsigned long int st_mtime_nsec_;
|
||||||
|
+ kernel_time_t st_ctime_;
|
||||||
|
+ unsigned long int st_ctime_nsec_;
|
||||||
|
+ unsigned long int __unused4;
|
||||||
|
+ unsigned long int __unused5;
|
||||||
|
+};
|
||||||
|
#elif (defined(__mips__) && _MIPS_SIM != _MIPS_SIM_ABI64)
|
||||||
|
typedef int kernel_blkcnt_t;
|
||||||
|
typedef int kernel_blksize_t;
|
||||||
|
@@ -1824,6 +1877,28 @@ struct kernel_statx {
|
||||||
|
#ifndef __NR_getcpu
|
||||||
|
#define __NR_getcpu 302
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+/* Linux commit 86250b9d12caa1a3dee12a7cf638b7dd70eaadb6 (2010) adds
|
||||||
|
+ * direct socket system calls to PPC */
|
||||||
|
+#ifndef __NR_socket
|
||||||
|
+#define __NR_socket 326
|
||||||
|
+#endif
|
||||||
|
+#ifndef __NR_socketpair
|
||||||
|
+#define __NR_socketpair 333
|
||||||
|
+#endif
|
||||||
|
+#ifndef __NR_sendto
|
||||||
|
+#define __NR_sendto 335
|
||||||
|
+#endif
|
||||||
|
+#ifndef __NR_shutdown
|
||||||
|
+#define __NR_shutdown 338
|
||||||
|
+#endif
|
||||||
|
+#ifndef __NR_sendmsg
|
||||||
|
+#define __NR_sendmsg 341
|
||||||
|
+#endif
|
||||||
|
+#ifndef __NR_recvmsg
|
||||||
|
+#define __NR_recvmsg 342
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
/* End of powerpc defininitions */
|
||||||
|
#elif defined(__s390__)
|
||||||
|
#ifndef __NR_quotactl
|
||||||
|
@@ -3363,6 +3438,11 @@ struct kernel_statx {
|
||||||
|
/* TODO(csilvers): consider wrapping some args up in a struct, like we
|
||||||
|
* do for i386's _syscall6, so we can compile successfully on gcc 2.95
|
||||||
|
*/
|
||||||
|
+ #ifdef __powerpc64__
|
||||||
|
+ /* TODO: implement clone() for ppc64.
|
||||||
|
+ * until then, use system libc */
|
||||||
|
+ #define sys_clone clone
|
||||||
|
+ #else
|
||||||
|
LSS_INLINE int LSS_NAME(clone)(int (*fn)(void *), void *child_stack,
|
||||||
|
int flags, void *arg, int *parent_tidptr,
|
||||||
|
void *newtls, int *child_tidptr) {
|
||||||
|
@@ -3433,6 +3513,7 @@ struct kernel_statx {
|
||||||
|
}
|
||||||
|
LSS_RETURN(int, __ret, __err);
|
||||||
|
}
|
||||||
|
+ #endif
|
||||||
|
#elif defined(__s390__)
|
||||||
|
#undef LSS_REG
|
||||||
|
#define LSS_REG(r, a) register unsigned long __r##r __asm__("r"#r) = (unsigned long) a
|
||||||
|
@@ -4783,7 +4864,7 @@ struct kernel_statx {
|
||||||
|
LSS_INLINE _syscall6(void*, mmap, void*, addr, size_t, length, int, prot,
|
||||||
|
int, flags, int, fd, int64_t, offset)
|
||||||
|
#endif
|
||||||
|
- #if defined(__PPC__)
|
||||||
|
+ #if defined(__PPC__) && !defined(__powerpc64__)
|
||||||
|
#undef LSS_SC_LOADARGS_0
|
||||||
|
#define LSS_SC_LOADARGS_0(dummy...)
|
||||||
|
#undef LSS_SC_LOADARGS_1
|
||||||
|
@@ -5173,7 +5254,11 @@ struct kernel_statx {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(__NR_pipe)
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ LSS_INLINE pid_t LSS_NAME(pipe)(int *pipefd) {
|
||||||
|
+#else
|
||||||
|
LSS_INLINE int LSS_NAME(pipe)(int *pipefd) {
|
||||||
|
+#endif
|
||||||
|
return LSS_NAME(pipe2)(pipefd, 0);
|
||||||
|
}
|
||||||
|
#endif
|
@ -0,0 +1,37 @@
|
|||||||
|
From cca78240860abb63bbcfe94d1e5f04a1f23c527d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 19:11:56 -0500
|
||||||
|
Subject: [PATCH 3/4] sandbox/linux/system_headers: Update linux seccomp header
|
||||||
|
for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/system_headers/linux_seccomp.h | 10 ++++++++++
|
||||||
|
1 file changed, 10 insertions(+)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_seccomp.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_seccomp.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_seccomp.h
|
||||||
|
@@ -38,6 +38,9 @@
|
||||||
|
#ifndef EM_AARCH64
|
||||||
|
#define EM_AARCH64 183
|
||||||
|
#endif
|
||||||
|
+#ifndef EM_PPC64
|
||||||
|
+#define EM_PPC64 21
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#ifndef __AUDIT_ARCH_64BIT
|
||||||
|
#define __AUDIT_ARCH_64BIT 0x80000000
|
||||||
|
@@ -70,6 +73,12 @@
|
||||||
|
#ifndef AUDIT_ARCH_AARCH64
|
||||||
|
#define AUDIT_ARCH_AARCH64 (EM_AARCH64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
|
||||||
|
#endif
|
||||||
|
+#ifndef AUDIT_ARCH_PPC64
|
||||||
|
+#define AUDIT_ARCH_PPC64 (EM_PPC64 | __AUDIT_ARCH_64BIT)
|
||||||
|
+#endif
|
||||||
|
+#ifndef AUDIT_ARCH_PPC64LE
|
||||||
|
+#define AUDIT_ARCH_PPC64LE (EM_PPC64 | __AUDIT_ARCH_64BIT | __AUDIT_ARCH_LE)
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
// For prctl.h
|
||||||
|
#ifndef PR_SET_SECCOMP
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,23 @@
|
|||||||
|
From 298df3dc44f7121cd8cb9a06b29fa3b16c959b8d Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 19:13:25 -0500
|
||||||
|
Subject: [PATCH 4/4] sandbox/linux/system_headers: Update linux signal header
|
||||||
|
for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/system_headers/linux_signal.h | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_signal.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_signal.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_signal.h
|
||||||
|
@@ -13,7 +13,7 @@
|
||||||
|
// (not undefined, but defined different values and in different memory
|
||||||
|
// layouts). So, fill the gap here.
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__arm__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
|
||||||
|
#define LINUX_SIGHUP 1
|
||||||
|
#define LINUX_SIGINT 2
|
@ -0,0 +1,17 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||||
|
+++ chromium-128.0.6613.113/third_party/crashpad/crashpad/util/net/http_transport_libcurl.cc
|
||||||
|
@@ -239,6 +239,12 @@ std::string UserAgent() {
|
||||||
|
#endif
|
||||||
|
#elif defined (ARCH_CPU_RISCV64)
|
||||||
|
static constexpr char arch[] = "riscv64";
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+#if defined(ARCH_CPU_LITTLE_ENDIAN)
|
||||||
|
+ static constexpr char arch[] = "ppc64";
|
||||||
|
+#elif defined(ARCH_CPU_BIG_ENDIAN)
|
||||||
|
+ static constexpr char arch[] = "ppc64_be";
|
||||||
|
+#endif
|
||||||
|
#else
|
||||||
|
#error Port
|
||||||
|
#endif
|
@ -0,0 +1,376 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vp9/encoder/ppc/vp9_quantize_vsx.c
|
||||||
|
@@ -38,6 +38,28 @@ static INLINE int16x8_t vec_max_across(i
|
||||||
|
return vec_max(a, vec_perm(a, a, vec_perm16));
|
||||||
|
}
|
||||||
|
|
||||||
|
+static INLINE void
|
||||||
|
+vec_u64_store(vector unsigned long long vecu64, unsigned long offset, void *ptr)
|
||||||
|
+{
|
||||||
|
+#ifndef WORDS_BIGENDIAN
|
||||||
|
+ __asm__ ("xxswapd %x0, %x1"
|
||||||
|
+ : "=wa" (vecu64)
|
||||||
|
+ : "wa" (vecu64));
|
||||||
|
+#endif
|
||||||
|
+#if __GNUC__ >= 4
|
||||||
|
+ if (__builtin_constant_p (offset) && offset == 0)
|
||||||
|
+ __asm__ ("stxvd2x %x0,0,%1\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory");
|
||||||
|
+ else
|
||||||
|
+#endif
|
||||||
|
+ __asm__ ("stxvd2x %x0,%1,%2\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" (offset), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory", "r0");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
void vp9_quantize_fp_vsx(const tran_low_t *coeff_ptr, intptr_t n_coeffs,
|
||||||
|
const int16_t *round_ptr, const int16_t *quant_ptr,
|
||||||
|
tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr,
|
||||||
|
@@ -60,10 +82,10 @@ void vp9_quantize_fp_vsx(const tran_low_
|
||||||
|
qcoeff0 = vec_mulhi(vec_vaddshs(vec_abs(coeff0), round), quant);
|
||||||
|
zero_coeff0 = vec_cmpeq(qcoeff0, vec_zeros_s16);
|
||||||
|
qcoeff0 = vec_sign(qcoeff0, coeff0);
|
||||||
|
- vec_vsx_st(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff0 = vec_mladd(qcoeff0, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
|
||||||
|
// Remove DC value from round and quant
|
||||||
|
round = vec_splat(round, 1);
|
||||||
|
@@ -76,10 +98,10 @@ void vp9_quantize_fp_vsx(const tran_low_
|
||||||
|
qcoeff1 = vec_mulhi(vec_vaddshs(vec_abs(coeff1), round), quant);
|
||||||
|
zero_coeff1 = vec_cmpeq(qcoeff1, vec_zeros_s16);
|
||||||
|
qcoeff1 = vec_sign(qcoeff1, coeff1);
|
||||||
|
- vec_vsx_st(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff1 = vec_mladd(qcoeff1, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(vec_or(scan0, zero_coeff0), vec_or(scan1, zero_coeff1));
|
||||||
|
|
||||||
|
@@ -107,23 +129,23 @@ void vp9_quantize_fp_vsx(const tran_low_
|
||||||
|
qcoeff0 = vec_mulhi(vec_vaddshs(vec_abs(coeff0), round), quant);
|
||||||
|
zero_coeff0 = vec_cmpeq(qcoeff0, vec_zeros_s16);
|
||||||
|
qcoeff0 = vec_sign(qcoeff0, coeff0);
|
||||||
|
- vec_vsx_st(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
dqcoeff0 = vec_mladd(qcoeff0, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
|
||||||
|
qcoeff1 = vec_mulhi(vec_vaddshs(vec_abs(coeff1), round), quant);
|
||||||
|
zero_coeff1 = vec_cmpeq(qcoeff1, vec_zeros_s16);
|
||||||
|
qcoeff1 = vec_sign(qcoeff1, coeff1);
|
||||||
|
- vec_vsx_st(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
dqcoeff1 = vec_mladd(qcoeff1, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
|
||||||
|
qcoeff2 = vec_mulhi(vec_vaddshs(vec_abs(coeff2), round), quant);
|
||||||
|
zero_coeff2 = vec_cmpeq(qcoeff2, vec_zeros_s16);
|
||||||
|
qcoeff2 = vec_sign(qcoeff2, coeff2);
|
||||||
|
- vec_vsx_st(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
dqcoeff2 = vec_mladd(qcoeff2, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(eob, vec_or(scan0, zero_coeff0));
|
||||||
|
eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2));
|
||||||
|
@@ -200,10 +222,10 @@ void vp9_quantize_fp_32x32_vsx(const tra
|
||||||
|
qcoeff0 = vec_and(qcoeff0, mask0);
|
||||||
|
zero_coeff0 = vec_cmpeq(qcoeff0, vec_zeros_s16);
|
||||||
|
qcoeff0 = vec_sign(qcoeff0, coeff0);
|
||||||
|
- vec_vsx_st(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff0 = dequantize_coeff_32(qcoeff0, dequant);
|
||||||
|
- vec_vsx_st(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
|
||||||
|
// Remove DC value from thres, round, quant and dequant
|
||||||
|
thres = vec_splat(thres, 1);
|
||||||
|
@@ -219,10 +241,10 @@ void vp9_quantize_fp_32x32_vsx(const tra
|
||||||
|
qcoeff1 = vec_and(qcoeff1, mask1);
|
||||||
|
zero_coeff1 = vec_cmpeq(qcoeff1, vec_zeros_s16);
|
||||||
|
qcoeff1 = vec_sign(qcoeff1, coeff1);
|
||||||
|
- vec_vsx_st(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff1 = dequantize_coeff_32(qcoeff1, dequant);
|
||||||
|
- vec_vsx_st(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(vec_or(scan0, zero_coeff0), vec_or(scan1, zero_coeff1));
|
||||||
|
|
||||||
|
@@ -260,17 +282,17 @@ void vp9_quantize_fp_32x32_vsx(const tra
|
||||||
|
qcoeff1 = vec_sign(qcoeff1, coeff1);
|
||||||
|
qcoeff2 = vec_sign(qcoeff2, coeff2);
|
||||||
|
|
||||||
|
- vec_vsx_st(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff0 = dequantize_coeff_32(qcoeff0, dequant);
|
||||||
|
dqcoeff1 = dequantize_coeff_32(qcoeff1, dequant);
|
||||||
|
dqcoeff2 = dequantize_coeff_32(qcoeff2, dequant);
|
||||||
|
|
||||||
|
- vec_vsx_st(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(eob, vec_or(scan0, zero_coeff0));
|
||||||
|
eob2 = vec_max(vec_or(scan1, zero_coeff1), vec_or(scan2, zero_coeff2));
|
||||||
|
Index: chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vpx_dsp/ppc/fdct32x32_vsx.c
|
||||||
|
@@ -15,6 +15,28 @@
|
||||||
|
#include "vpx_dsp/ppc/txfm_common_vsx.h"
|
||||||
|
#include "vpx_dsp/ppc/types_vsx.h"
|
||||||
|
|
||||||
|
+static INLINE void
|
||||||
|
+vec_u64_store(vector unsigned long long vecu64, unsigned long offset, void *ptr)
|
||||||
|
+{
|
||||||
|
+#ifndef WORDS_BIGENDIAN
|
||||||
|
+ __asm__ ("xxswapd %x0, %x1"
|
||||||
|
+ : "=wa" (vecu64)
|
||||||
|
+ : "wa" (vecu64));
|
||||||
|
+#endif
|
||||||
|
+#if __GNUC__ >= 4
|
||||||
|
+ if (__builtin_constant_p (offset) && offset == 0)
|
||||||
|
+ __asm__ ("stxvd2x %x0,0,%1\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory");
|
||||||
|
+ else
|
||||||
|
+#endif
|
||||||
|
+ __asm__ ("stxvd2x %x0,%1,%2\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" (offset), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory", "r0");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// Returns ((a +/- b) * cospi16 + (2 << 13)) >> 14.
|
||||||
|
static INLINE void single_butterfly(int16x8_t a, int16x8_t b, int16x8_t *add,
|
||||||
|
int16x8_t *sub) {
|
||||||
|
@@ -164,45 +186,45 @@ static INLINE void load(const int16_t *a
|
||||||
|
}
|
||||||
|
|
||||||
|
static INLINE void store(tran_low_t *a, const int16x8_t *b) {
|
||||||
|
- vec_vsx_st(b[0], 0, a);
|
||||||
|
- vec_vsx_st(b[8], 0, a + 8);
|
||||||
|
- vec_vsx_st(b[16], 0, a + 16);
|
||||||
|
- vec_vsx_st(b[24], 0, a + 24);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[1], 0, a + 32);
|
||||||
|
- vec_vsx_st(b[9], 0, a + 40);
|
||||||
|
- vec_vsx_st(b[17], 0, a + 48);
|
||||||
|
- vec_vsx_st(b[25], 0, a + 56);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[2], 0, a + 64);
|
||||||
|
- vec_vsx_st(b[10], 0, a + 72);
|
||||||
|
- vec_vsx_st(b[18], 0, a + 80);
|
||||||
|
- vec_vsx_st(b[26], 0, a + 88);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[3], 0, a + 96);
|
||||||
|
- vec_vsx_st(b[11], 0, a + 104);
|
||||||
|
- vec_vsx_st(b[19], 0, a + 112);
|
||||||
|
- vec_vsx_st(b[27], 0, a + 120);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[4], 0, a + 128);
|
||||||
|
- vec_vsx_st(b[12], 0, a + 136);
|
||||||
|
- vec_vsx_st(b[20], 0, a + 144);
|
||||||
|
- vec_vsx_st(b[28], 0, a + 152);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[5], 0, a + 160);
|
||||||
|
- vec_vsx_st(b[13], 0, a + 168);
|
||||||
|
- vec_vsx_st(b[21], 0, a + 176);
|
||||||
|
- vec_vsx_st(b[29], 0, a + 184);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[6], 0, a + 192);
|
||||||
|
- vec_vsx_st(b[14], 0, a + 200);
|
||||||
|
- vec_vsx_st(b[22], 0, a + 208);
|
||||||
|
- vec_vsx_st(b[30], 0, a + 216);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(b[7], 0, a + 224);
|
||||||
|
- vec_vsx_st(b[15], 0, a + 232);
|
||||||
|
- vec_vsx_st(b[23], 0, a + 240);
|
||||||
|
- vec_vsx_st(b[31], 0, a + 248);
|
||||||
|
+ vec_u64_store(b[0], 0, a);
|
||||||
|
+ vec_u64_store(b[8], 0, a + 8);
|
||||||
|
+ vec_u64_store(b[16], 0, a + 16);
|
||||||
|
+ vec_u64_store(b[24], 0, a + 24);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[1], 0, a + 32);
|
||||||
|
+ vec_u64_store(b[9], 0, a + 40);
|
||||||
|
+ vec_u64_store(b[17], 0, a + 48);
|
||||||
|
+ vec_u64_store(b[25], 0, a + 56);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[2], 0, a + 64);
|
||||||
|
+ vec_u64_store(b[10], 0, a + 72);
|
||||||
|
+ vec_u64_store(b[18], 0, a + 80);
|
||||||
|
+ vec_u64_store(b[26], 0, a + 88);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[3], 0, a + 96);
|
||||||
|
+ vec_u64_store(b[11], 0, a + 104);
|
||||||
|
+ vec_u64_store(b[19], 0, a + 112);
|
||||||
|
+ vec_u64_store(b[27], 0, a + 120);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[4], 0, a + 128);
|
||||||
|
+ vec_u64_store(b[12], 0, a + 136);
|
||||||
|
+ vec_u64_store(b[20], 0, a + 144);
|
||||||
|
+ vec_u64_store(b[28], 0, a + 152);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[5], 0, a + 160);
|
||||||
|
+ vec_u64_store(b[13], 0, a + 168);
|
||||||
|
+ vec_u64_store(b[21], 0, a + 176);
|
||||||
|
+ vec_u64_store(b[29], 0, a + 184);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[6], 0, a + 192);
|
||||||
|
+ vec_u64_store(b[14], 0, a + 200);
|
||||||
|
+ vec_u64_store(b[22], 0, a + 208);
|
||||||
|
+ vec_u64_store(b[30], 0, a + 216);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(b[7], 0, a + 224);
|
||||||
|
+ vec_u64_store(b[15], 0, a + 232);
|
||||||
|
+ vec_u64_store(b[23], 0, a + 240);
|
||||||
|
+ vec_u64_store(b[31], 0, a + 248);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Returns 1 if negative 0 if positive
|
||||||
|
Index: chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||||
|
+++ chromium-128.0.6613.113/third_party/libvpx/source/libvpx/vpx_dsp/ppc/quantize_vsx.c
|
||||||
|
@@ -13,6 +13,28 @@
|
||||||
|
#include "./vpx_dsp_rtcd.h"
|
||||||
|
#include "vpx_dsp/ppc/types_vsx.h"
|
||||||
|
|
||||||
|
+static INLINE void
|
||||||
|
+vec_u64_store(vector unsigned long long vecu64, unsigned long offset, void *ptr)
|
||||||
|
+{
|
||||||
|
+#ifndef WORDS_BIGENDIAN
|
||||||
|
+ __asm__ ("xxswapd %x0, %x1"
|
||||||
|
+ : "=wa" (vecu64)
|
||||||
|
+ : "wa" (vecu64));
|
||||||
|
+#endif
|
||||||
|
+#if __GNUC__ >= 4
|
||||||
|
+ if (__builtin_constant_p (offset) && offset == 0)
|
||||||
|
+ __asm__ ("stxvd2x %x0,0,%1\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory");
|
||||||
|
+ else
|
||||||
|
+#endif
|
||||||
|
+ __asm__ ("stxvd2x %x0,%1,%2\n\t"
|
||||||
|
+ :
|
||||||
|
+ : "wa" (vecu64), "r" (offset), "r" ((uintptr_t)ptr)
|
||||||
|
+ : "memory", "r0");
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
// Negate 16-bit integers in a when the corresponding signed 16-bit
|
||||||
|
// integer in b is negative.
|
||||||
|
static INLINE int16x8_t vec_sign(int16x8_t a, int16x8_t b) {
|
||||||
|
@@ -124,19 +146,19 @@ void vpx_quantize_b_vsx(const tran_low_t
|
||||||
|
|
||||||
|
qcoeff0 =
|
||||||
|
quantize_coeff(coeff0, coeff0_abs, round, quant, quant_shift, zero_mask0);
|
||||||
|
- vec_vsx_st(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
round = vec_splat(round, 1);
|
||||||
|
quant = vec_splat(quant, 1);
|
||||||
|
quant_shift = vec_splat(quant_shift, 1);
|
||||||
|
qcoeff1 =
|
||||||
|
quantize_coeff(coeff1, coeff1_abs, round, quant, quant_shift, zero_mask1);
|
||||||
|
- vec_vsx_st(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff0 = vec_mladd(qcoeff0, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, 0, dqcoeff_ptr);
|
||||||
|
dequant = vec_splat(dequant, 1);
|
||||||
|
dqcoeff1 = vec_mladd(qcoeff1, dequant, vec_zeros_s16);
|
||||||
|
- vec_vsx_st(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, 16, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(nonzero_scanindex(qcoeff0, iscan_ptr, 0),
|
||||||
|
nonzero_scanindex(qcoeff1, iscan_ptr, 16));
|
||||||
|
@@ -164,17 +186,17 @@ void vpx_quantize_b_vsx(const tran_low_t
|
||||||
|
zero_mask1);
|
||||||
|
qcoeff2 = quantize_coeff(coeff2, coeff2_abs, round, quant, quant_shift,
|
||||||
|
zero_mask2);
|
||||||
|
- vec_vsx_st(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
|
||||||
|
dqcoeff0 = vec_mladd(qcoeff0, dequant, vec_zeros_s16);
|
||||||
|
dqcoeff1 = vec_mladd(qcoeff1, dequant, vec_zeros_s16);
|
||||||
|
dqcoeff2 = vec_mladd(qcoeff2, dequant, vec_zeros_s16);
|
||||||
|
|
||||||
|
- vec_vsx_st(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff0, off0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff1, off1, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dqcoeff2, off2, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(eob, nonzero_scanindex(qcoeff0, iscan_ptr, off0));
|
||||||
|
eob2 = vec_max(nonzero_scanindex(qcoeff1, iscan_ptr, off1),
|
||||||
|
@@ -243,12 +265,12 @@ void vpx_quantize_b_32x32_vsx(const tran
|
||||||
|
qcoeff1 = quantize_coeff_32(coeff1, coeff1_abs, round, quant, quant_shift,
|
||||||
|
zero_mask1);
|
||||||
|
|
||||||
|
- vec_vsx_st(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, 0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, 16, qcoeff_ptr);
|
||||||
|
|
||||||
|
- vec_vsx_st(dequantize_coeff_32(qcoeff0, dequant), 0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dequantize_coeff_32(qcoeff0, dequant), 0, dqcoeff_ptr);
|
||||||
|
dequant = vec_splat(dequant, 1); // remove DC from dequant
|
||||||
|
- vec_vsx_st(dequantize_coeff_32(qcoeff1, dequant), 16, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dequantize_coeff_32(qcoeff1, dequant), 16, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(nonzero_scanindex(qcoeff0, iscan_ptr, 0),
|
||||||
|
nonzero_scanindex(qcoeff1, iscan_ptr, 16));
|
||||||
|
@@ -276,13 +298,13 @@ void vpx_quantize_b_32x32_vsx(const tran
|
||||||
|
qcoeff2 = quantize_coeff_32(coeff2, coeff2_abs, round, quant, quant_shift,
|
||||||
|
zero_mask2);
|
||||||
|
|
||||||
|
- vec_vsx_st(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
- vec_vsx_st(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
-
|
||||||
|
- vec_vsx_st(dequantize_coeff_32(qcoeff0, dequant), off0, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dequantize_coeff_32(qcoeff1, dequant), off1, dqcoeff_ptr);
|
||||||
|
- vec_vsx_st(dequantize_coeff_32(qcoeff2, dequant), off2, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff0, off0, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff1, off1, qcoeff_ptr);
|
||||||
|
+ vec_u64_store(qcoeff2, off2, qcoeff_ptr);
|
||||||
|
+
|
||||||
|
+ vec_u64_store(dequantize_coeff_32(qcoeff0, dequant), off0, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dequantize_coeff_32(qcoeff1, dequant), off1, dqcoeff_ptr);
|
||||||
|
+ vec_u64_store(dequantize_coeff_32(qcoeff2, dequant), off2, dqcoeff_ptr);
|
||||||
|
|
||||||
|
eob = vec_max(eob, nonzero_scanindex(qcoeff0, iscan_ptr, off0));
|
||||||
|
eob2 = vec_max(nonzero_scanindex(qcoeff1, iscan_ptr, off1),
|
@ -0,0 +1,107 @@
|
|||||||
|
From 1d44643a7c7cf650efd1093d22cd5bf859fdcb51 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 9 Aug 2018 20:52:13 -0500
|
||||||
|
Subject: [PATCH] sandbox/linux/seccomp-bpf: Add ppc64 syscall stub
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/seccomp-bpf/syscall.cc | 53 ++++++++++++++++++++++++++--
|
||||||
|
1 file changed, 51 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf/syscall.cc
|
||||||
|
@@ -23,7 +23,7 @@ namespace sandbox {
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||||
|
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||||
|
+ defined(ARCH_CPU_MIPS_FAMILY) || defined (ARCH_CPU_PPC64_FAMILY)
|
||||||
|
// Number that's not currently used by any Linux kernel ABIs.
|
||||||
|
const int kInvalidSyscallNumber = 0x351d3;
|
||||||
|
#else
|
||||||
|
@@ -313,10 +313,54 @@ asm(// We need to be able to tell the ke
|
||||||
|
"2:ret\n"
|
||||||
|
".cfi_endproc\n"
|
||||||
|
".size SyscallAsm, .-SyscallAsm\n"
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ ".text\n"
|
||||||
|
+ ".align 4\n"
|
||||||
|
+ ".type SyscallAsm @function\n"
|
||||||
|
+ "SyscallAsm:\n"
|
||||||
|
+ ".cfi_startproc\n"
|
||||||
|
+
|
||||||
|
+ // Check if r3 is negative
|
||||||
|
+ "cmpdi 3, 0\n"
|
||||||
|
+ "bgt 2f\n"
|
||||||
|
+
|
||||||
|
+ // Load address of 3f into r3 and return
|
||||||
|
+ "mflr 10\n"
|
||||||
|
+ "bl 1f\n"
|
||||||
|
+ "1: mflr 3\n"
|
||||||
|
+ "mtlr 10\n"
|
||||||
|
+ "addi 3, 3, 4*13\n"
|
||||||
|
+ "blr\n"
|
||||||
|
+
|
||||||
|
+ // Load arguments from array into r3-8
|
||||||
|
+ // save param 3 in r10
|
||||||
|
+ "2:\n"
|
||||||
|
+ "mr 0, 3\n"
|
||||||
|
+ "ld 3, 0(4)\n"
|
||||||
|
+ "ld 5, 16(4)\n"
|
||||||
|
+ "ld 6, 24(4)\n"
|
||||||
|
+ "ld 7, 32(4)\n"
|
||||||
|
+ "ld 8, 40(4)\n"
|
||||||
|
+ "ld 4, 8(4)\n"
|
||||||
|
+ "li 9, 0\n"
|
||||||
|
+
|
||||||
|
+ // Enter kernel
|
||||||
|
+ "sc\n"
|
||||||
|
+
|
||||||
|
+ // Magic return address
|
||||||
|
+ "3:\n"
|
||||||
|
+ // Like MIPS, ppc64 return values are always positive.
|
||||||
|
+ // Check for error in cr0.SO and negate upon error
|
||||||
|
+ "bc 4, 3, 4f\n"
|
||||||
|
+ "neg 3, 3\n"
|
||||||
|
+ "4: blr\n"
|
||||||
|
+
|
||||||
|
+ ".cfi_endproc\n"
|
||||||
|
+ ".size SyscallAsm, .-SyscallAsm\n"
|
||||||
|
#endif
|
||||||
|
); // asm
|
||||||
|
|
||||||
|
-#if defined(__x86_64__)
|
||||||
|
+#if defined(__x86_64__) || defined(__powerpc64__)
|
||||||
|
extern "C" {
|
||||||
|
intptr_t SyscallAsm(intptr_t nr, const intptr_t args[6]);
|
||||||
|
}
|
||||||
|
@@ -430,6 +474,8 @@ intptr_t Syscall::Call(int nr,
|
||||||
|
ret = inout;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+ intptr_t ret = SyscallAsm(nr, args);
|
||||||
|
#else
|
||||||
|
#error "Unimplemented architecture"
|
||||||
|
#endif
|
||||||
|
@@ -446,8 +492,18 @@ void Syscall::PutValueInUcontext(intptr_
|
||||||
|
// needs to be changed back.
|
||||||
|
ret_val = -ret_val;
|
||||||
|
SECCOMP_PARM4(ctx) = 1;
|
||||||
|
- } else
|
||||||
|
+ } else {
|
||||||
|
SECCOMP_PARM4(ctx) = 0;
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // Same as MIPS, need to invert ret and set error register (cr0.SO)
|
||||||
|
+ if (ret_val <= -1 && ret_val >= -4095) {
|
||||||
|
+ ret_val = -ret_val;
|
||||||
|
+ ctx->uc_mcontext.regs->ccr |= (1 << 28);
|
||||||
|
+ } else {
|
||||||
|
+ ctx->uc_mcontext.regs->ccr &= ~(1 << 28);
|
||||||
|
+ }
|
||||||
|
#endif
|
||||||
|
SECCOMP_RESULT(ctx) = static_cast<greg_t>(ret_val);
|
||||||
|
}
|
@ -0,0 +1,24 @@
|
|||||||
|
From 6a852c4135864ba87b3cbdd0880d7cfecf7cd654 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Shawn Anastasio <shawnanastasio@yahoo.com>
|
||||||
|
Date: Thu, 13 Sep 2018 15:12:22 -0500
|
||||||
|
Subject: [PATCH 5/6] sandbox/linux: update unit test for ppc64
|
||||||
|
|
||||||
|
---
|
||||||
|
sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc | 2 +-
|
||||||
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/baseline_policy_unittest.cc
|
||||||
|
@@ -350,8 +350,10 @@ TEST_BASELINE_SIGSYS(__NR_timer_create)
|
||||||
|
|
||||||
|
#if !defined(__aarch64__)
|
||||||
|
TEST_BASELINE_SIGSYS(__NR_inotify_init)
|
||||||
|
+#if !defined(__powerpc64__)
|
||||||
|
TEST_BASELINE_SIGSYS(__NR_vserver)
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if defined(LIBC_GLIBC) && !BUILDFLAG(IS_CHROMEOS_ASH)
|
||||||
|
BPF_TEST_C(BaselinePolicy, FutexEINVAL, BaselinePolicy) {
|
@ -0,0 +1,14 @@
|
|||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/seccomp-bpf-helpers/syscall_sets.cc
|
||||||
|
@@ -374,7 +374,9 @@ bool SyscallSets::IsAllowedSignalHandlin
|
||||||
|
#if defined(__i386__) || defined(__arm__) || \
|
||||||
|
(defined(ARCH_CPU_MIPS_FAMILY) && defined(ARCH_CPU_32_BITS)) || \
|
||||||
|
defined(__powerpc64__)
|
||||||
|
+#if !defined(__powerpc64__)
|
||||||
|
case __NR_rt_sigtimedwait_time64:
|
||||||
|
+#endif
|
||||||
|
case __NR_sigaction:
|
||||||
|
case __NR_sigprocmask:
|
||||||
|
case __NR_sigreturn:
|
@ -0,0 +1,33 @@
|
|||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/linux_stat.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/linux_stat.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/linux_stat.h
|
||||||
|
@@ -173,6 +173,28 @@ struct kernel_stat {
|
||||||
|
unsigned int __unused4;
|
||||||
|
unsigned int __unused5;
|
||||||
|
};
|
||||||
|
+#elif defined(__powerpc64__)
|
||||||
|
+struct kernel_stat {
|
||||||
|
+ unsigned long st_dev;
|
||||||
|
+ ino_t st_ino;
|
||||||
|
+ unsigned long st_nlink;
|
||||||
|
+ mode_t st_mode;
|
||||||
|
+ uid_t st_uid;
|
||||||
|
+ gid_t st_gid;
|
||||||
|
+ unsigned long st_rdev;
|
||||||
|
+ long st_size;
|
||||||
|
+ unsigned long st_blksize;
|
||||||
|
+ unsigned long st_blocks;
|
||||||
|
+ // unsigned long st_atime;
|
||||||
|
+ unsigned long st_atime_nsec;
|
||||||
|
+ //unsigned long st_mtime;
|
||||||
|
+ unsigned long st_mtime_nsec;
|
||||||
|
+ //unsigned long st_ctime;
|
||||||
|
+ unsigned long st_ctime_nsec;
|
||||||
|
+ unsigned long __unused4;
|
||||||
|
+ unsigned long __unused5;
|
||||||
|
+ unsigned long __unused6;
|
||||||
|
+};
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if !defined(AT_EMPTY_PATH)
|
@ -0,0 +1,90 @@
|
|||||||
|
Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/policy/linux/bpf_utility_policy_linux.cc
|
||||||
|
@@ -34,7 +34,7 @@ ResultExpr UtilityProcessPolicy::Evaluat
|
||||||
|
case __NR_fdatasync:
|
||||||
|
case __NR_fsync:
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_getrlimit:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || defined(__arm__)
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/policy/linux/bpf_renderer_policy_linux.cc
|
||||||
|
@@ -87,7 +87,7 @@ ResultExpr RendererProcessPolicy::Evalua
|
||||||
|
case __NR_ftruncate64:
|
||||||
|
#endif
|
||||||
|
#if defined(__i386__) || defined(__x86_64__) || defined(__mips__) || \
|
||||||
|
- defined(__aarch64__)
|
||||||
|
+ defined(__aarch64__) || defined(__powerpc64__)
|
||||||
|
case __NR_getrlimit:
|
||||||
|
case __NR_setrlimit:
|
||||||
|
// We allow setrlimit to dynamically adjust the address space limit as
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/bpf_dsl/linux_syscall_ranges.h
|
||||||
|
@@ -58,9 +58,9 @@
|
||||||
|
|
||||||
|
#elif defined(__powerpc64__)
|
||||||
|
|
||||||
|
-#include <asm/unistd.h>
|
||||||
|
+#include <asm-generic/unistd.h>
|
||||||
|
#define MIN_SYSCALL 0u
|
||||||
|
-#define MAX_PUBLIC_SYSCALL 386u
|
||||||
|
+#define MAX_PUBLIC_SYSCALL __NR_syscalls
|
||||||
|
#define MAX_SYSCALL MAX_PUBLIC_SYSCALL
|
||||||
|
|
||||||
|
#else
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/services/credentials.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/services/credentials.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/services/credentials.cc
|
||||||
|
@@ -96,7 +96,8 @@ bool ChrootToSafeEmptyDir() {
|
||||||
|
|
||||||
|
int clone_flags = CLONE_FS | LINUX_SIGCHLD;
|
||||||
|
void* tls = nullptr;
|
||||||
|
-#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY)) && \
|
||||||
|
+#if (defined(ARCH_CPU_X86_64) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||||
|
+ defined(ARCH_CPU_PPC64_FAMILY)) && \
|
||||||
|
!defined(MEMORY_SANITIZER)
|
||||||
|
// Use CLONE_VM | CLONE_VFORK as an optimization to avoid copying page tables.
|
||||||
|
// Since clone writes to the new child's TLS before returning, we must set a
|
||||||
|
@@ -104,6 +105,11 @@ bool ChrootToSafeEmptyDir() {
|
||||||
|
// glibc performs syscalls by calling a function pointer in TLS, so we do not
|
||||||
|
// attempt this optimization.
|
||||||
|
// TODO(crbug.com/40196869) Broken in MSan builds after LLVM f1bb30a4956f.
|
||||||
|
+ //
|
||||||
|
+ // NOTE: Without CLONE_VM, fontconfig will attempt to reload configuration
|
||||||
|
+ // in every thread. Since the rendered threads are sandboxed without
|
||||||
|
+ // filesystem access (e.g. to /etc/fonts/fonts.conf) this will cause font
|
||||||
|
+ // configuration loading failures and no fonts will be displayed!
|
||||||
|
clone_flags |= CLONE_VM | CLONE_VFORK | CLONE_SETTLS;
|
||||||
|
|
||||||
|
char tls_buf[PTHREAD_STACK_MIN_CONST] = {0};
|
||||||
|
Index: chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||||
|
+++ chromium-130.0.6723.44/sandbox/linux/seccomp-bpf-helpers/sigsys_handlers.cc
|
||||||
|
@@ -362,7 +362,16 @@ intptr_t SIGSYSFstatatHandler(const stru
|
||||||
|
if (args.nr == __NR_fstatat_default) {
|
||||||
|
if (*reinterpret_cast<const char*>(args.args[1]) == '\0' &&
|
||||||
|
args.args[3] == static_cast<uint64_t>(AT_EMPTY_PATH)) {
|
||||||
|
- return syscall(__NR_fstat_default, static_cast<int>(args.args[0]),
|
||||||
|
+ int fd = static_cast<int>(args.args[0]);
|
||||||
|
+#if defined(__powerpc64__)
|
||||||
|
+ // On ppc64+glibc, some syscalls seem to accidentally negate the first
|
||||||
|
+ // parameter which causes checks against it to fail. For now, manually
|
||||||
|
+ // negate them back.
|
||||||
|
+ // TODO: Investigate the root cause and fix in glibc
|
||||||
|
+ if (fd < 0)
|
||||||
|
+ fd = -fd;
|
||||||
|
+#endif
|
||||||
|
+ return syscall(__NR_fstat_default, fd,
|
||||||
|
reinterpret_cast<default_stat_struct*>(args.args[2]));
|
||||||
|
}
|
||||||
|
return -reinterpret_cast<intptr_t>(fs_denied_errno);
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: chromium-128.0.6613.113/base/compiler_specific.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/base/compiler_specific.h
|
||||||
|
+++ chromium-128.0.6613.113/base/compiler_specific.h
|
||||||
|
@@ -88,7 +88,7 @@
|
||||||
|
// Can be used only on return statements, even for functions returning void.
|
||||||
|
// Caller and callee must have the same number of arguments and its types must
|
||||||
|
// be "similar".
|
||||||
|
-#if defined(__clang__) && HAS_ATTRIBUTE(musttail)
|
||||||
|
+#if defined(__clang__) && HAS_ATTRIBUTE(musttail) && !defined(__powerpc64__)
|
||||||
|
#define MUSTTAIL [[clang::musttail]]
|
||||||
|
#else
|
||||||
|
#define MUSTTAIL
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkRasterPipeline.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkRasterPipeline.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkRasterPipeline.h
|
||||||
|
@@ -27,7 +27,7 @@ struct SkImageInfo;
|
||||||
|
struct skcms_TransferFunction;
|
||||||
|
|
||||||
|
#if __has_cpp_attribute(clang::musttail) && !defined(__EMSCRIPTEN__) && !defined(SK_CPU_ARM32) && \
|
||||||
|
- !defined(SK_CPU_LOONGARCH) && !(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK))
|
||||||
|
+ !defined(SK_CPU_LOONGARCH) && !(defined(_WIN32) && defined(SK_BUILD_FOR_ANDROID_FRAMEWORK)) && !defined(__powerpc64__)
|
||||||
|
// [[clang::musttail]] is disabled for the Android version of Skia running on Windows as it
|
||||||
|
// causes crashes (This is probably related to http://crbug.com/1505442).
|
||||||
|
#define SK_HAS_MUSTTAIL 1
|
@ -0,0 +1,48 @@
|
|||||||
|
Index: chromium-130.0.6723.44/third_party/libvpx/generate_gni.sh
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/libvpx/generate_gni.sh
|
||||||
|
+++ chromium-130.0.6723.44/third_party/libvpx/generate_gni.sh
|
||||||
|
@@ -433,7 +433,7 @@ gen_config_files linux/mipsel "--target=
|
||||||
|
gen_config_files linux/mips64el "--target=mips64-linux-gcc ${all_platforms}"
|
||||||
|
gen_config_files linux/loongarch \
|
||||||
|
"--target=loongarch64-linux-gcc ${all_platforms}"
|
||||||
|
-gen_config_files linux/ppc64 "--target=ppc64le-linux-gcc ${all_platforms}"
|
||||||
|
+gen_config_files linux/ppc64 "--target=generic-gnu $HIGHBD ${all_platforms}"
|
||||||
|
gen_config_files linux/generic "--target=generic-gnu $HIGHBD ${all_platforms}"
|
||||||
|
gen_config_files win/arm64-highbd \
|
||||||
|
"--target=arm64-win64-vs15 ${all_platforms} ${HIGHBD} ${disable_sve}"
|
||||||
|
Index: chromium-130.0.6723.44/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||||
|
+++ chromium-130.0.6723.44/third_party/libvpx/source/libvpx/build/make/rtcd.pl
|
||||||
|
@@ -509,8 +509,9 @@ if ($opts{arch} eq 'x86') {
|
||||||
|
&require(@REQUIRES);
|
||||||
|
arm;
|
||||||
|
} elsif ($opts{arch} =~ /^ppc/ ) {
|
||||||
|
- @ALL_ARCHS = filter(qw/vsx/);
|
||||||
|
- ppc;
|
||||||
|
+ #@ALL_ARCHS = filter(qw/vsx/);
|
||||||
|
+ #ppc;
|
||||||
|
+ unoptimized;
|
||||||
|
} elsif ($opts{arch} =~ /loongarch/ ) {
|
||||||
|
@ALL_ARCHS = filter(qw/lsx lasx/);
|
||||||
|
loongarch;
|
||||||
|
Index: chromium-130.0.6723.44/third_party/libvpx/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/libvpx/BUILD.gn
|
||||||
|
+++ chromium-130.0.6723.44/third_party/libvpx/BUILD.gn
|
||||||
|
@@ -102,6 +102,14 @@ config("libvpx_config") {
|
||||||
|
"-Wno-sign-compare",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
+
|
||||||
|
+ if (current_cpu == "ppc64") {
|
||||||
|
+ cflags += [
|
||||||
|
+ "-mcpu=power8",
|
||||||
|
+ "-maltivec",
|
||||||
|
+ "-mvsx",
|
||||||
|
+ ]
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
# This config is applied to targets that depend on libvpx.
|
@ -0,0 +1,23 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/webrtc/rtc_base/system/arch.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/webrtc/rtc_base/system/arch.h
|
||||||
|
+++ chromium-128.0.6613.113/third_party/webrtc/rtc_base/system/arch.h
|
||||||
|
@@ -46,6 +46,18 @@
|
||||||
|
#endif
|
||||||
|
#if defined(__MIPSEL__)
|
||||||
|
#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#elif defined(__PPC__)
|
||||||
|
+#define WEBRTC_ARCH_PPC_FAMILY
|
||||||
|
+#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
|
||||||
|
+#define WEBRTC_ARCH_LITTLE_ENDIAN
|
||||||
|
+#else
|
||||||
|
+#define WEBRTC_ARCH_BIG_ENDIAN
|
||||||
|
+#endif
|
||||||
|
+#if defined(__LP64__)
|
||||||
|
+#define WEBRTC_ARCH_64_BITS
|
||||||
|
+#else
|
||||||
|
+#define WEBRTC_ARCH_32_BITS
|
||||||
|
+#endif
|
||||||
|
#else
|
||||||
|
#define WEBRTC_ARCH_BIG_ENDIAN
|
||||||
|
#endif
|
@ -0,0 +1,11 @@
|
|||||||
|
--- a/sandbox/linux/services/credentials.cc
|
||||||
|
+++ b/sandbox/linux/services/credentials.cc
|
||||||
|
@@ -91,7 +91,7 @@ bool ChrootToSafeEmptyDir() {
|
||||||
|
alignas(16) char stack_buf[PTHREAD_STACK_MIN];
|
||||||
|
|
||||||
|
#if defined(ARCH_CPU_X86_FAMILY) || defined(ARCH_CPU_ARM_FAMILY) || \
|
||||||
|
- defined(ARCH_CPU_MIPS_FAMILY)
|
||||||
|
+ defined(ARCH_CPU_MIPS_FAMILY) || defined(ARCH_CPU_PPC64_FAMILY)
|
||||||
|
// The stack grows downward.
|
||||||
|
void* stack = stack_buf + sizeof(stack_buf);
|
||||||
|
#else
|
@ -0,0 +1,11 @@
|
|||||||
|
--- a/base/system/sys_info.cc
|
||||||
|
+++ b/base/system/sys_info.cc
|
||||||
|
@@ -255,6 +255,8 @@
|
||||||
|
return "ARM";
|
||||||
|
#elif defined(ARCH_CPU_ARM64)
|
||||||
|
return "ARM_64";
|
||||||
|
+#elif defined(ARCH_CPU_PPC64)
|
||||||
|
+ return "PPC_64";
|
||||||
|
#elif defined(ARCH_CPU_RISCV64)
|
||||||
|
return "RISCV_64";
|
||||||
|
#else
|
@ -0,0 +1,46 @@
|
|||||||
|
Index: chromium-128.0.6613.113/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||||
|
+++ chromium-128.0.6613.113/chrome/browser/extensions/api/runtime/chrome_runtime_api_delegate.cc
|
||||||
|
@@ -303,6 +303,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
|
||||||
|
info->arch = extensions::api::runtime::PlatformArch::kMips;
|
||||||
|
} else if (strcmp(arch, "mips64el") == 0) {
|
||||||
|
info->arch = extensions::api::runtime::PlatformArch::kMips64;
|
||||||
|
+ } else if (strcmp(arch, "ppc64") == 0) {
|
||||||
|
+ info->arch = extensions::api::runtime::PlatformArch::kPpc64;
|
||||||
|
} else {
|
||||||
|
NOTREACHED_IN_MIGRATION();
|
||||||
|
return false;
|
||||||
|
@@ -319,6 +321,8 @@ bool ChromeRuntimeAPIDelegate::GetPlatfo
|
||||||
|
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips;
|
||||||
|
} else if (strcmp(nacl_arch, "mips64") == 0) {
|
||||||
|
info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kMips64;
|
||||||
|
+ } else if (strcmp(nacl_arch, "ppc64") == 0) {
|
||||||
|
+ info->nacl_arch = extensions::api::runtime::PlatformNaclArch::kPpc64;
|
||||||
|
} else {
|
||||||
|
NOTREACHED_IN_MIGRATION();
|
||||||
|
return false;
|
||||||
|
Index: chromium-128.0.6613.113/extensions/common/api/runtime.json
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/extensions/common/api/runtime.json
|
||||||
|
+++ chromium-128.0.6613.113/extensions/common/api/runtime.json
|
||||||
|
@@ -98,7 +98,8 @@
|
||||||
|
{"name": "x86-32", "description": "Specifies the processer architecture as x86-32."},
|
||||||
|
{"name": "x86-64", "description": "Specifies the processer architecture as x86-64."},
|
||||||
|
{"name": "mips", "description": "Specifies the processer architecture as mips."},
|
||||||
|
- {"name": "mips64", "description": "Specifies the processer architecture as mips64."}
|
||||||
|
+ {"name": "mips64", "description": "Specifies the processer architecture as mips64."},
|
||||||
|
+ {"name": "ppc64", "description": "Specifies the processer architecture as ppc64."}
|
||||||
|
],
|
||||||
|
"description": "The machine's processor architecture."
|
||||||
|
},
|
||||||
|
@@ -111,7 +112,8 @@
|
||||||
|
{"name": "x86-32", "description": "Specifies the native client architecture as x86-32."},
|
||||||
|
{"name": "x86-64", "description": "Specifies the native client architecture as x86-64."},
|
||||||
|
{"name": "mips", "description": "Specifies the native client architecture as mips."},
|
||||||
|
- {"name": "mips64", "description": "Specifies the native client architecture as mips64."}
|
||||||
|
+ {"name": "mips64", "description": "Specifies the native client architecture as mips64."},
|
||||||
|
+ {"name": "ppc64", "description": "Specifies the native client architecture as ppc64."}
|
||||||
|
]
|
||||||
|
},
|
||||||
|
{
|
@ -0,0 +1,12 @@
|
|||||||
|
--- a/base/process/launch.h
|
||||||
|
+++ b/base/process/launch.h
|
||||||
|
@@ -54,6 +54,9 @@
|
||||||
|
#if defined(ARCH_CPU_ARM64)
|
||||||
|
#define PTHREAD_STACK_MIN_CONST \
|
||||||
|
(__builtin_constant_p(PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : 131072)
|
||||||
|
+#elif defined(ARCH_CPU_PPC64)
|
||||||
|
+#define PTHREAD_STACK_MIN_CONST \
|
||||||
|
+ (__builtin_constant_p(PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : 131072)
|
||||||
|
#else
|
||||||
|
#define PTHREAD_STACK_MIN_CONST \
|
||||||
|
(__builtin_constant_p(PTHREAD_STACK_MIN) ? PTHREAD_STACK_MIN : 16384)
|
@ -0,0 +1,13 @@
|
|||||||
|
Index: chromium-130.0.6723.44/build/rust/cargo_crate.gni
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/build/rust/cargo_crate.gni
|
||||||
|
+++ chromium-130.0.6723.44/build/rust/cargo_crate.gni
|
||||||
|
@@ -430,7 +430,7 @@ template("cargo_crate") {
|
||||||
|
]
|
||||||
|
}
|
||||||
|
if (current_cpu == "arm64" || current_cpu == "x64" ||
|
||||||
|
- current_cpu == "loong64" || current_cpu == "riscv64") {
|
||||||
|
+ current_cpu == "loong64" || current_cpu == "riscv64" || current_cpu == "ppc64") {
|
||||||
|
args += [
|
||||||
|
"--pointer-width",
|
||||||
|
"64",
|
@ -0,0 +1,24 @@
|
|||||||
|
diff -up chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h.me chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h
|
||||||
|
--- chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h.me 2024-02-06 08:22:36.013021582 +0100
|
||||||
|
+++ chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor.h 2024-02-06 08:23:08.281607499 +0100
|
||||||
|
@@ -77,7 +77,7 @@ class XSLTProcessor final : public Scrip
|
||||||
|
|
||||||
|
void reset();
|
||||||
|
|
||||||
|
- static void ParseErrorFunc(void* user_data, const xmlError*);
|
||||||
|
+ static void ParseErrorFunc(void* user_data, xmlError*);
|
||||||
|
static void GenericErrorFunc(void* user_data, const char* msg, ...);
|
||||||
|
|
||||||
|
// Only for libXSLT callbacks
|
||||||
|
diff -up chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.me chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc
|
||||||
|
--- chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc.me 2024-02-06 08:14:32.368066214 +0100
|
||||||
|
+++ chromium-121.0.6167.139/third_party/blink/renderer/core/xml/xslt_processor_libxslt.cc 2024-02-06 08:23:08.282607518 +0100
|
||||||
|
@@ -66,7 +66,7 @@ void XSLTProcessor::GenericErrorFunc(voi
|
||||||
|
// It would be nice to do something with this error message.
|
||||||
|
}
|
||||||
|
|
||||||
|
-void XSLTProcessor::ParseErrorFunc(void* user_data, const xmlError* error) {
|
||||||
|
+void XSLTProcessor::ParseErrorFunc(void* user_data, xmlError* error) {
|
||||||
|
FrameConsole* console = static_cast<FrameConsole*>(user_data);
|
||||||
|
if (!console)
|
||||||
|
return;
|
@ -0,0 +1,34 @@
|
|||||||
|
diff -up chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc.me chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc
|
||||||
|
--- chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc.me 2024-01-16 10:54:38.994173911 +0100
|
||||||
|
+++ chromium-121.0.6167.57/media/ffmpeg/ffmpeg_common.cc 2024-01-16 11:06:20.974160612 +0100
|
||||||
|
@@ -710,8 +710,13 @@ bool AVStreamToVideoDecoderConfig(const
|
||||||
|
}
|
||||||
|
|
||||||
|
VideoTransformation video_transformation = VideoTransformation();
|
||||||
|
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||||
|
+ for (int i = 0; i < stream->nb_side_data; i++) {
|
||||||
|
+ const auto& side_data = stream->side_data[i];
|
||||||
|
+#else
|
||||||
|
for (int i = 0; i < stream->codecpar->nb_coded_side_data; ++i) {
|
||||||
|
const auto& side_data = stream->codecpar->coded_side_data[i];
|
||||||
|
+#endif
|
||||||
|
switch (side_data.type) {
|
||||||
|
case AV_PKT_DATA_DISPLAYMATRIX: {
|
||||||
|
CHECK_EQ(side_data.size, sizeof(int32_t) * 3 * 3);
|
||||||
|
diff -up chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc.me chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc
|
||||||
|
--- chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc.me 2024-01-16 11:12:27.521534151 +0100
|
||||||
|
+++ chromium-121.0.6167.57/media/filters/audio_video_metadata_extractor.cc 2024-01-16 11:15:08.717337026 +0100
|
||||||
|
@@ -113,8 +113,13 @@ bool AudioVideoMetadataExtractor::Extrac
|
||||||
|
if (!stream)
|
||||||
|
continue;
|
||||||
|
|
||||||
|
+#if LIBAVCODEC_VERSION_INT < AV_VERSION_INT(60, 31, 102)
|
||||||
|
+ for (int j = 0; j < stream->nb_side_data; j++) {
|
||||||
|
+ const AVPacketSideData& sd = stream->side_data[j];
|
||||||
|
+#else
|
||||||
|
for (int j = 0; j < stream->codecpar->nb_coded_side_data; j++) {
|
||||||
|
const AVPacketSideData& sd = stream->codecpar->coded_side_data[j];
|
||||||
|
+#endif
|
||||||
|
if (sd.type == AV_PKT_DATA_DISPLAYMATRIX) {
|
||||||
|
CHECK_EQ(sd.size, sizeof(int32_t) * 3 * 3);
|
||||||
|
rotation_ = VideoTransformation::FromFFmpegDisplayMatrix(
|
@ -0,0 +1,17 @@
|
|||||||
|
diff -up chromium-122.0.6261.57/build/config/compiler/BUILD.gn.me chromium-122.0.6261.57/build/config/compiler/BUILD.gn
|
||||||
|
--- chromium-122.0.6261.57/build/config/compiler/BUILD.gn.me 2024-02-23 12:32:11.248584653 +0100
|
||||||
|
+++ chromium-122.0.6261.57/build/config/compiler/BUILD.gn 2024-02-23 12:45:26.672302958 +0100
|
||||||
|
@@ -399,6 +399,13 @@ config("compiler") {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
+ if (is_clang) {
|
||||||
|
+ cflags += [ "-ftrivial-auto-var-init=zero" ]
|
||||||
|
+ if (!is_ubsan && !is_ubsan_security) {
|
||||||
|
+ cflags += [ "-fwrapv" ]
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
# Linker warnings.
|
||||||
|
if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
|
||||||
|
current_os != "zos") {
|
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-123.0.6312.46/build/config/compiler/BUILD.gn.fstack-protector-strong chromium-123.0.6312.46/build/config/compiler/BUILD.gn
|
||||||
|
--- chromium-123.0.6312.46/build/config/compiler/BUILD.gn.fstack-protector-strong 2024-03-15 11:46:34.542248116 +0100
|
||||||
|
+++ chromium-123.0.6312.46/build/config/compiler/BUILD.gn 2024-03-15 11:59:02.970849847 +0100
|
||||||
|
@@ -382,7 +382,7 @@ config("compiler") {
|
||||||
|
} else if ((is_posix && !is_chromeos && !is_nacl) || is_fuchsia) {
|
||||||
|
if (current_os != "aix") {
|
||||||
|
# Not available on aix.
|
||||||
|
- cflags += [ "-fstack-protector" ]
|
||||||
|
+ cflags += [ "-fstack-protector-strong" ]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-123.0.6312.58/chrome/browser/component_updater/screen_ai_component_installer.cc.me chromium-123.0.6312.58/chrome/browser/component_updater/screen_ai_component_installer.cc
|
||||||
|
--- chromium-123.0.6312.58/chrome/browser/component_updater/screen_ai_component_installer.cc.me 2024-03-24 10:58:43.033885904 +0100
|
||||||
|
+++ chromium-123.0.6312.58/chrome/browser/component_updater/screen_ai_component_installer.cc 2024-03-24 11:00:38.861979740 +0100
|
||||||
|
@@ -143,8 +143,7 @@ void ScreenAIComponentInstallerPolicy::D
|
||||||
|
void ManageScreenAIComponentRegistration(ComponentUpdateService* cus,
|
||||||
|
PrefService* local_state) {
|
||||||
|
if (screen_ai::ScreenAIInstallState::ShouldInstall(local_state)) {
|
||||||
|
- RegisterScreenAIComponent(cus);
|
||||||
|
- return;
|
||||||
|
+ // don't register the screenn ai service
|
||||||
|
}
|
||||||
|
|
||||||
|
// Clean up.
|
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni
|
||||||
|
--- chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni.me 2024-04-18 15:12:34.007397489 +0200
|
||||||
|
+++ chromium-124.0.6367.60/base/allocator/partition_allocator/partition_alloc.gni 2024-04-18 15:13:06.166051954 +0200
|
||||||
|
@@ -32,8 +32,7 @@ if (is_nacl) {
|
||||||
|
# Increases the size of the empty slot span ring.
|
||||||
|
use_large_empty_slot_span_ring = is_mac
|
||||||
|
|
||||||
|
-has_memory_tagging =
|
||||||
|
- current_cpu == "arm64" && is_clang && !is_asan && (is_linux || is_android)
|
||||||
|
+has_memory_tagging = false
|
||||||
|
|
||||||
|
declare_args() {
|
||||||
|
# Causes all the allocations to be routed via allocator_shim.cc. Usually,
|
@ -0,0 +1,11 @@
|
|||||||
|
diff -up chromium-124.0.6367.155/ui/qt/BUILD.gn.me chromium-124.0.6367.155/ui/qt/BUILD.gn
|
||||||
|
--- chromium-124.0.6367.155/ui/qt/BUILD.gn.me 2024-05-08 18:15:34.178627040 +0200
|
||||||
|
+++ chromium-124.0.6367.155/ui/qt/BUILD.gn 2024-05-08 18:29:31.162513709 +0200
|
||||||
|
@@ -61,6 +61,7 @@ template("qt_shim") {
|
||||||
|
packages = [
|
||||||
|
"Qt" + invoker.qt_version + "Core",
|
||||||
|
"Qt" + invoker.qt_version + "Widgets",
|
||||||
|
+ "Qt" + invoker.qt_version + "Gui",
|
||||||
|
]
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,12 @@
|
|||||||
|
diff -up chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists chromium-125.0.6422.41/media/base/media_switches.cc
|
||||||
|
--- chromium-125.0.6422.41/media/base/media_switches.cc.disable-FFmpegAllowLists 2024-05-12 21:28:43.694027396 +0200
|
||||||
|
+++ chromium-125.0.6422.41/media/base/media_switches.cc 2024-05-12 21:32:48.155063623 +0200
|
||||||
|
@@ -1753,7 +1753,7 @@ BASE_FEATURE(kUseWindowBoundsForPip,
|
||||||
|
// Enables FFmpeg allow lists for supported codecs / containers.
|
||||||
|
BASE_FEATURE(kFFmpegAllowLists,
|
||||||
|
"FFmpegAllowLists",
|
||||||
|
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||||||
|
+ base::FEATURE_DISABLED_BY_DEFAULT);
|
||||||
|
|
||||||
|
#if BUILDFLAG(IS_WIN)
|
||||||
|
// Enables audio offload when supported by endpoints.
|
@ -0,0 +1,105 @@
|
|||||||
|
commit 62274859104bd828373ae406aa9309e610449ac5
|
||||||
|
Author: Ted Meyer <tmathmeyer@chromium.org>
|
||||||
|
Date: Fri Mar 22 19:56:55 2024 +0000
|
||||||
|
|
||||||
|
Replace deprecated use of AVCodecContext::reordered_opaque
|
||||||
|
|
||||||
|
We can use the AV_CODEC_FLAG_COPY_OPAQUE flag on the codec context
|
||||||
|
now to trigger timestamp propagation.
|
||||||
|
|
||||||
|
Bug: 330573128
|
||||||
|
Change-Id: I6bc57241a35ab5283742aad8d42acb4dc5e85858
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5384308
|
||||||
|
Commit-Queue: Ted (Chromium) Meyer <tmathmeyer@chromium.org>
|
||||||
|
Reviewed-by: Dan Sanders <sandersd@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/main@{#1277051}
|
||||||
|
|
||||||
|
diff --git a/media/filters/ffmpeg_video_decoder.cc b/media/filters/ffmpeg_video_decoder.cc
|
||||||
|
index bd75477feeabb..8a658a58caac5 100644
|
||||||
|
--- a/media/filters/ffmpeg_video_decoder.cc
|
||||||
|
+++ b/media/filters/ffmpeg_video_decoder.cc
|
||||||
|
@@ -134,7 +134,7 @@ bool FFmpegVideoDecoder::IsCodecSupported(VideoCodec codec) {
|
||||||
|
}
|
||||||
|
|
||||||
|
FFmpegVideoDecoder::FFmpegVideoDecoder(MediaLog* media_log)
|
||||||
|
- : media_log_(media_log) {
|
||||||
|
+ : media_log_(media_log), timestamp_map_(128) {
|
||||||
|
DVLOG(1) << __func__;
|
||||||
|
DETACH_FROM_SEQUENCE(sequence_checker_);
|
||||||
|
}
|
||||||
|
@@ -363,8 +363,10 @@ bool FFmpegVideoDecoder::FFmpegDecode(const DecoderBuffer& buffer) {
|
||||||
|
DCHECK(packet->data);
|
||||||
|
DCHECK_GT(packet->size, 0);
|
||||||
|
|
||||||
|
- // Let FFmpeg handle presentation timestamp reordering.
|
||||||
|
- codec_context_->reordered_opaque = buffer.timestamp().InMicroseconds();
|
||||||
|
+ const int64_t timestamp = buffer.timestamp().InMicroseconds();
|
||||||
|
+ const TimestampId timestamp_id = timestamp_id_generator_.GenerateNextId();
|
||||||
|
+ timestamp_map_.Put(std::make_pair(timestamp_id, timestamp));
|
||||||
|
+ packet->opaque = reinterpret_cast<void*>(timestamp_id.GetUnsafeValue());
|
||||||
|
}
|
||||||
|
FFmpegDecodingLoop::DecodeStatus decode_status = decoding_loop_->DecodePacket(
|
||||||
|
packet, base::BindRepeating(&FFmpegVideoDecoder::OnNewFrame,
|
||||||
|
@@ -423,7 +425,12 @@ bool FFmpegVideoDecoder::OnNewFrame(AVFrame* frame) {
|
||||||
|
}
|
||||||
|
gfx::Size natural_size = aspect_ratio.GetNaturalSize(visible_rect);
|
||||||
|
|
||||||
|
- const auto pts = base::Microseconds(frame->reordered_opaque);
|
||||||
|
+ const auto ts_id = TimestampId(reinterpret_cast<size_t>(frame->opaque));
|
||||||
|
+ const auto ts_lookup = timestamp_map_.Get(ts_id);
|
||||||
|
+ if (ts_lookup == timestamp_map_.end()) {
|
||||||
|
+ return false;
|
||||||
|
+ }
|
||||||
|
+ const auto pts = base::Microseconds(std::get<1>(*ts_lookup));
|
||||||
|
auto video_frame = VideoFrame::WrapExternalDataWithLayout(
|
||||||
|
opaque->layout, visible_rect, natural_size, opaque->data, opaque->size,
|
||||||
|
pts);
|
||||||
|
@@ -498,8 +505,10 @@ bool FFmpegVideoDecoder::ConfigureDecoder(const VideoDecoderConfig& config,
|
||||||
|
codec_context_->thread_count = GetFFmpegVideoDecoderThreadCount(config);
|
||||||
|
codec_context_->thread_type =
|
||||||
|
FF_THREAD_SLICE | (low_delay ? 0 : FF_THREAD_FRAME);
|
||||||
|
+
|
||||||
|
codec_context_->opaque = this;
|
||||||
|
codec_context_->get_buffer2 = GetVideoBufferImpl;
|
||||||
|
+ codec_context_->flags |= AV_CODEC_FLAG_COPY_OPAQUE;
|
||||||
|
|
||||||
|
if (base::FeatureList::IsEnabled(kFFmpegAllowLists)) {
|
||||||
|
// Note: FFmpeg will try to free this string, so we must duplicate it.
|
||||||
|
diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
||||||
|
index d02cb89c3ddf7..0a2de1c623fff 100644
|
||||||
|
--- a/media/filters/ffmpeg_video_decoder.h
|
||||||
|
+++ b/media/filters/ffmpeg_video_decoder.h
|
||||||
|
@@ -7,10 +7,12 @@
|
||||||
|
|
||||||
|
#include <memory>
|
||||||
|
|
||||||
|
+#include "base/containers/lru_cache.h"
|
||||||
|
#include "base/functional/callback.h"
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
|
#include "base/memory/scoped_refptr.h"
|
||||||
|
#include "base/sequence_checker.h"
|
||||||
|
+#include "base/types/id_type.h"
|
||||||
|
#include "media/base/frame_buffer_pool.h"
|
||||||
|
#include "media/base/supported_video_decoder_config.h"
|
||||||
|
#include "media/base/video_decoder.h"
|
||||||
|
@@ -87,6 +89,20 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
||||||
|
// FFmpeg structures owned by this object.
|
||||||
|
std::unique_ptr<AVCodecContext, ScopedPtrAVFreeContext> codec_context_;
|
||||||
|
|
||||||
|
+ // The gist here is that timestamps need to be 64 bits to store microsecond
|
||||||
|
+ // precision. A 32 bit integer would overflow at ~35 minutes at this level of
|
||||||
|
+ // precision. We can't cast the timestamp to the void ptr object used by the
|
||||||
|
+ // opaque field in ffmpeg then, because it would lose data on a 32 bit build.
|
||||||
|
+ // However, we don't actually have 2^31 timestamped frames in a single
|
||||||
|
+ // playback, so it's fine to use the 32 bit value as a key in a map which
|
||||||
|
+ // contains the actual timestamps. Additionally, we've in the past set 128
|
||||||
|
+ // outstanding frames for re-ordering as a limit for cross-thread decoding
|
||||||
|
+ // tasks, so we'll do that here too with the LRU cache.
|
||||||
|
+ using TimestampId = base::IdType<int64_t, size_t, 0>;
|
||||||
|
+
|
||||||
|
+ TimestampId::Generator timestamp_id_generator_;
|
||||||
|
+ base::LRUCache<TimestampId, int64_t> timestamp_map_;
|
||||||
|
+
|
||||||
|
VideoDecoderConfig config_;
|
||||||
|
|
||||||
|
scoped_refptr<FrameBufferPool> frame_pool_;
|
@ -0,0 +1,38 @@
|
|||||||
|
diff -up chromium-125.0.6422.41/net/filter/brotli_source_stream.cc.system-brotli chromium-125.0.6422.41/net/filter/brotli_source_stream.cc
|
||||||
|
--- chromium-125.0.6422.41/net/filter/brotli_source_stream.cc.system-brotli 2024-05-08 22:30:00.000000000 +0200
|
||||||
|
+++ chromium-125.0.6422.41/net/filter/brotli_source_stream.cc 2024-05-12 20:23:30.859178769 +0200
|
||||||
|
@@ -11,8 +11,8 @@
|
||||||
|
#include "base/memory/raw_ptr.h"
|
||||||
|
#include "base/metrics/histogram_macros.h"
|
||||||
|
#include "net/base/io_buffer.h"
|
||||||
|
-#include "third_party/brotli/include/brotli/decode.h"
|
||||||
|
-#include "third_party/brotli/include/brotli/shared_dictionary.h"
|
||||||
|
+#include <brotli/decode.h>
|
||||||
|
+#include <brotli/shared_dictionary.h>
|
||||||
|
|
||||||
|
namespace net {
|
||||||
|
|
||||||
|
diff -up chromium-125.0.6422.41/net/ssl/cert_compression.cc.system-brotli chromium-125.0.6422.41/net/ssl/cert_compression.cc
|
||||||
|
--- chromium-125.0.6422.41/net/ssl/cert_compression.cc.system-brotli 2024-05-08 22:30:00.000000000 +0200
|
||||||
|
+++ chromium-125.0.6422.41/net/ssl/cert_compression.cc 2024-05-12 20:23:30.860178793 +0200
|
||||||
|
@@ -9,7 +9,7 @@
|
||||||
|
#include "third_party/boringssl/src/include/openssl/ssl.h"
|
||||||
|
|
||||||
|
#if !defined(NET_DISABLE_BROTLI)
|
||||||
|
-#include "third_party/brotli/include/brotli/decode.h"
|
||||||
|
+#include <brotli/decode.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
|
namespace net {
|
||||||
|
diff -up chromium-125.0.6422.41/ui/base/resource/resource_bundle.cc.system-brotli chromium-125.0.6422.41/ui/base/resource/resource_bundle.cc
|
||||||
|
--- chromium-125.0.6422.41/ui/base/resource/resource_bundle.cc.system-brotli 2024-05-12 20:23:30.861178816 +0200
|
||||||
|
+++ chromium-125.0.6422.41/ui/base/resource/resource_bundle.cc 2024-05-12 21:19:03.775332093 +0200
|
||||||
|
@@ -33,7 +33,7 @@
|
||||||
|
#include "net/filter/gzip_header.h"
|
||||||
|
#include "skia/ext/image_operations.h"
|
||||||
|
#include "third_party/abseil-cpp/absl/types/variant.h"
|
||||||
|
-#include "third_party/brotli/include/brotli/decode.h"
|
||||||
|
+#include "brotli/decode.h"
|
||||||
|
#include "third_party/skia/include/codec/SkPngDecoder.h"
|
||||||
|
#include "third_party/skia/include/core/SkBitmap.h"
|
||||||
|
#include "third_party/skia/include/core/SkColor.h"
|
@ -0,0 +1,28 @@
|
|||||||
|
diff -up chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me chromium-126.0.6478.26/build/config/compiler/BUILD.gn
|
||||||
|
--- chromium-126.0.6478.26/build/config/compiler/BUILD.gn.me 2024-06-02 14:02:52.516602574 +0200
|
||||||
|
+++ chromium-126.0.6478.26/build/config/compiler/BUILD.gn 2024-06-02 14:17:24.527503540 +0200
|
||||||
|
@@ -575,24 +575,6 @@ config("compiler") {
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
- # TODO(crbug.com/40283598): This causes binary size growth and potentially
|
||||||
|
- # other problems.
|
||||||
|
- # TODO(crbug.com/40284925): This isn't supported by Cronet's mainline llvm version.
|
||||||
|
- if (default_toolchain != "//build/toolchain/cros:target" &&
|
||||||
|
- !llvm_android_mainline) {
|
||||||
|
- cflags += [
|
||||||
|
- "-mllvm",
|
||||||
|
- "-split-threshold-for-reg-with-hint=0",
|
||||||
|
- ]
|
||||||
|
- if (use_thin_lto && is_a_target_toolchain) {
|
||||||
|
- if (is_win) {
|
||||||
|
- ldflags += [ "-mllvm:-split-threshold-for-reg-with-hint=0" ]
|
||||||
|
- } else {
|
||||||
|
- ldflags += [ "-Wl,-mllvm,-split-threshold-for-reg-with-hint=0" ]
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
# TODO(crbug.com/40192287): Investigate why/if this should be needed.
|
||||||
|
if (is_win) {
|
||||||
|
cflags += [ "/clang:-ffp-contract=off" ]
|
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-127.0.6533.72/sandbox/linux/syscall_broker/broker_process.cc.me chromium-127.0.6533.72/sandbox/linux/syscall_broker/broker_process.cc
|
||||||
|
--- chromium-127.0.6533.72/sandbox/linux/syscall_broker/broker_process.cc.me 2024-07-30 18:09:59.483141522 +0200
|
||||||
|
+++ chromium-127.0.6533.72/sandbox/linux/syscall_broker/broker_process.cc 2024-07-30 19:42:47.122708543 +0200
|
||||||
|
@@ -163,9 +163,6 @@ bool BrokerProcess::IsSyscallBrokerable(
|
||||||
|
case __NR_stat:
|
||||||
|
case __NR_lstat:
|
||||||
|
#endif
|
||||||
|
-#if defined(__NR_fstatat)
|
||||||
|
- case __NR_fstatat:
|
||||||
|
-#endif
|
||||||
|
#if defined(__NR_fstatat64)
|
||||||
|
case __NR_fstatat64:
|
||||||
|
#endif
|
@ -0,0 +1,15 @@
|
|||||||
|
diff -up chromium-127.0.6533.72/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me chromium-127.0.6533.72/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h
|
||||||
|
--- chromium-127.0.6533.72/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h.me 2024-07-25 23:58:19.751616508 +0200
|
||||||
|
+++ chromium-127.0.6533.72/base/allocator/partition_allocator/src/partition_alloc/aarch64_support.h 2024-07-26 00:01:46.391800969 +0200
|
||||||
|
@@ -10,9 +10,11 @@
|
||||||
|
#include "partition_alloc/build_config.h"
|
||||||
|
#include "partition_alloc/partition_alloc_buildflags.h"
|
||||||
|
|
||||||
|
+#if 0
|
||||||
|
#if PA_BUILDFLAG(IS_ANDROID) || PA_BUILDFLAG(IS_LINUX)
|
||||||
|
#define HAS_HW_CAPS
|
||||||
|
#endif
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#if PA_BUILDFLAG(PA_ARCH_CPU_ARM64) && defined(HAS_HW_CAPS)
|
||||||
|
#include <asm/hwcap.h>
|
@ -0,0 +1,67 @@
|
|||||||
|
diff -up chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me chromium-127.0.6533.72/build/rust/rust_bindgen.gni
|
||||||
|
--- chromium-127.0.6533.72/build/rust/rust_bindgen.gni.me 2024-07-25 16:11:18.754551595 +0200
|
||||||
|
+++ chromium-127.0.6533.72/build/rust/rust_bindgen.gni 2024-07-25 16:11:33.997837660 +0200
|
||||||
|
@@ -22,7 +22,7 @@ _libclang_path = rust_bindgen_root
|
||||||
|
if (host_os == "win") {
|
||||||
|
_libclang_path += "/bin"
|
||||||
|
} else {
|
||||||
|
- _libclang_path += "/lib"
|
||||||
|
+ _libclang_path += "/lib64"
|
||||||
|
}
|
||||||
|
|
||||||
|
# Template to build Rust/C bindings with bindgen.
|
||||||
|
diff -up chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib chromium-121.0.6167.57/build/config/clang/BUILD.gn
|
||||||
|
--- chromium-121.0.6167.57/build/config/clang/BUILD.gn.rust-clang_lib 2024-01-10 16:43:01.000000000 +0100
|
||||||
|
+++ chromium-121.0.6167.57/build/config/clang/BUILD.gn 2024-01-20 19:51:38.481992799 +0100
|
||||||
|
@@ -112,6 +112,7 @@ template("clang_lib") {
|
||||||
|
_prefix = "lib"
|
||||||
|
_suffix = ""
|
||||||
|
_ext = "a"
|
||||||
|
+ _libprefix = ""
|
||||||
|
if (is_win) {
|
||||||
|
_dir = "windows"
|
||||||
|
_prefix = ""
|
||||||
|
@@ -127,7 +128,33 @@ template("clang_lib") {
|
||||||
|
}
|
||||||
|
} else if (is_apple) {
|
||||||
|
_dir = "darwin"
|
||||||
|
- } else if (is_linux || is_chromeos) {
|
||||||
|
+ } else if (is_linux) {
|
||||||
|
+ if (current_cpu == "x64") {
|
||||||
|
+ _dir = "x86_64-redhat-linux-gnu"
|
||||||
|
+ _suffix ="-x86_64"
|
||||||
|
+ } else if (current_cpu == "x86") {
|
||||||
|
+ _dir = "i386-redhat-linux-gnu"
|
||||||
|
+ _suffix = "-i386"
|
||||||
|
+ } else if (current_cpu == "arm64") {
|
||||||
|
+ _dir = "aarch64-redhat-linux-gnu"
|
||||||
|
+ _suffix = "-aarch64"
|
||||||
|
+ } else if (current_cpu == "arm") {
|
||||||
|
+ _dir = "armhf-redhat-linux-gnu"
|
||||||
|
+ _suffix = "-armhf"
|
||||||
|
+ } else if (current_cpu == "ppc64") {
|
||||||
|
+ _dir = "ppc64le-redhat-linux-gnu"
|
||||||
|
+ _suffix = "-ppc64le"
|
||||||
|
+ } else {
|
||||||
|
+ assert(false) # Unhandled cpu type
|
||||||
|
+ }
|
||||||
|
+ # different clang lib dir in fedora/epel
|
||||||
|
+ if (clang_version == "17" || clang_version == "18" || clang_version == "19") {
|
||||||
|
+ _suffix = ""
|
||||||
|
+ } else if (clang_version == "14" || clang_version == "15" || clang_version == "16") {
|
||||||
|
+ _libprefix = "64"
|
||||||
|
+ _dir = ""
|
||||||
|
+ }
|
||||||
|
+ } else if (is_chromeos) {
|
||||||
|
if (current_cpu == "x64") {
|
||||||
|
_dir = "x86_64-unknown-linux-gnu"
|
||||||
|
} else if (current_cpu == "x86") {
|
||||||
|
@@ -166,7 +193,7 @@ template("clang_lib") {
|
||||||
|
assert(false) # Unhandled target platform
|
||||||
|
}
|
||||||
|
|
||||||
|
- _clang_lib_dir = "$clang_base_path/lib/clang/$clang_version/lib"
|
||||||
|
+ _clang_lib_dir = "$clang_base_path/lib${_libprefix}/clang/$clang_version/lib"
|
||||||
|
_lib_file = "${_prefix}clang_rt.${_libname}${_suffix}.${_ext}"
|
||||||
|
libs = [ "$_clang_lib_dir/$_dir/$_lib_file" ]
|
||||||
|
}
|
@ -0,0 +1,13 @@
|
|||||||
|
diff -up chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py
|
||||||
|
--- chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py.me 2024-09-16 12:47:47.541825252 +0200
|
||||||
|
+++ chromium-128.0.6613.137/third_party/inspector_protocol/code_generator.py 2024-09-16 12:48:39.210990291 +0200
|
||||||
|
@@ -147,8 +147,7 @@ def dash_to_camelcase(word):
|
||||||
|
|
||||||
|
def to_snake_case(name):
|
||||||
|
name = re.sub(r"([A-Z]{2,})([A-Z][a-z])", r"\1_\2", name)
|
||||||
|
- return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, sys.maxsize).lower()
|
||||||
|
-
|
||||||
|
+ return re.sub(r"([a-z0-9])([A-Z])", r"\1_\2", name, count=sys.maxsize).lower()
|
||||||
|
|
||||||
|
def to_method_case(config, name):
|
||||||
|
if config.use_title_case_methods:
|
@ -0,0 +1,32 @@
|
|||||||
|
diff -up chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc
|
||||||
|
--- chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc.me 2024-09-15 22:12:33.945186323 +0200
|
||||||
|
+++ chromium-129.0.6668.42.old/media/filters/ffmpeg_glue.cc 2024-09-16 10:53:13.334970539 +0200
|
||||||
|
@@ -17,14 +17,11 @@
|
||||||
|
|
||||||
|
namespace media {
|
||||||
|
|
||||||
|
-// Kill switches in case things explode. Remove after M132.
|
||||||
|
+// Kill switch in case things explode. Remove after M132.
|
||||||
|
// TODO(crbug.com/355485812): Re-enable this flag.
|
||||||
|
BASE_FEATURE(kAllowOnlyAudioCodecsDuringDemuxing,
|
||||||
|
"AllowOnlyAudioCodecsDuringDemuxing",
|
||||||
|
base::FEATURE_ENABLED_BY_DEFAULT);
|
||||||
|
-BASE_FEATURE(kForbidH264ParsingDuringDemuxing,
|
||||||
|
- "ForbidH264ParsingDuringDemuxing",
|
||||||
|
- base::FEATURE_ENABLED_BY_DEFAULT);
|
||||||
|
|
||||||
|
// Internal buffer size used by AVIO for reading.
|
||||||
|
// TODO(dalecurtis): Experiment with this buffer size and measure impact on
|
||||||
|
@@ -118,12 +115,6 @@ FFmpegGlue::FFmpegGlue(FFmpegURLProtocol
|
||||||
|
// Enable fast, but inaccurate seeks for MP3.
|
||||||
|
format_context_->flags |= AVFMT_FLAG_FAST_SEEK;
|
||||||
|
|
||||||
|
- // We don't allow H.264 parsing during demuxing since we have our own parser
|
||||||
|
- // and the ffmpeg one increases memory usage unnecessarily.
|
||||||
|
- if (base::FeatureList::IsEnabled(kForbidH264ParsingDuringDemuxing)) {
|
||||||
|
- format_context_->flags |= AVFMT_FLAG_NOH264PARSE;
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
// Ensures format parsing errors will bail out. From an audit on 11/2017, all
|
||||||
|
// instances were real failures. Solves bugs like http://crbug.com/710791.
|
||||||
|
format_context_->error_recognition |= AV_EF_EXPLODE;
|
File diff suppressed because it is too large
Load Diff
@ -0,0 +1,21 @@
|
|||||||
|
diff -up chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h
|
||||||
|
--- chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h.me 2024-10-15 09:58:39.571798463 +0200
|
||||||
|
+++ chromium-130.0.6723.44/components/media_router/common/providers/cast/channel/enum_table.h 2024-10-15 09:59:46.209147226 +0200
|
||||||
|
@@ -12,7 +12,6 @@
|
||||||
|
|
||||||
|
#include <cstdint>
|
||||||
|
#include <cstring>
|
||||||
|
-#include <new>
|
||||||
|
#include <optional>
|
||||||
|
#include <ostream>
|
||||||
|
#include <string_view>
|
||||||
|
@@ -368,7 +367,8 @@ class EnumTable {
|
||||||
|
|
||||||
|
private:
|
||||||
|
#ifdef ARCH_CPU_64_BITS
|
||||||
|
- alignas(std::hardware_destructive_interference_size)
|
||||||
|
+ // Align the data on a cache line boundary.
|
||||||
|
+ alignas(64)
|
||||||
|
#endif
|
||||||
|
std::initializer_list<Entry> data_;
|
||||||
|
bool is_sorted_;
|
@ -0,0 +1,90 @@
|
|||||||
|
commit f457e3c32b8170a39ead84ceaf9f0fdbe0696649
|
||||||
|
Author: Michael Lippautz <mlippautz@chromium.org>
|
||||||
|
Date: Tue Oct 15 19:27:32 2024 +0000
|
||||||
|
|
||||||
|
Fix size assertions across Blink
|
||||||
|
|
||||||
|
The ASSERT_SIZE() macro is used to check that certain object sizes do
|
||||||
|
not grow unexpectedly. Fix a few occurrences that assumed that Member
|
||||||
|
is always the same size as debug builds may blow up the pointer size
|
||||||
|
to allow verifying some conditions.
|
||||||
|
|
||||||
|
Bug: 373485798
|
||||||
|
Change-Id: I243dd7d75810e2cfda0141817986a6c4a03c6392
|
||||||
|
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/5934877
|
||||||
|
Commit-Queue: Michael Lippautz <mlippautz@chromium.org>
|
||||||
|
Reviewed-by: Steinar H Gunderson <sesse@chromium.org>
|
||||||
|
Cr-Commit-Position: refs/heads/main@{#1368939}
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/core/css/css_selector.cc b/third_party/blink/renderer/core/css/css_selector.cc
|
||||||
|
index e9cd483e0ce13..3d99eab57489e 100644
|
||||||
|
--- a/third_party/blink/renderer/core/css/css_selector.cc
|
||||||
|
+++ b/third_party/blink/renderer/core/css/css_selector.cc
|
||||||
|
@@ -88,7 +88,11 @@ unsigned MaximumSpecificity(
|
||||||
|
|
||||||
|
struct SameSizeAsCSSSelector {
|
||||||
|
unsigned bitfields;
|
||||||
|
- void* pointers[1];
|
||||||
|
+ union {
|
||||||
|
+ AtomicString value_;
|
||||||
|
+ QualifiedName tag_q_name_or_attribute_;
|
||||||
|
+ Member<void*> rare_data_;
|
||||||
|
+ } pointers;
|
||||||
|
};
|
||||||
|
|
||||||
|
ASSERT_SIZE(CSSSelector, SameSizeAsCSSSelector);
|
||||||
|
diff --git a/third_party/blink/renderer/core/css/resolver/match_result.h b/third_party/blink/renderer/core/css/resolver/match_result.h
|
||||||
|
index c99bae9777094..210ef8610b808 100644
|
||||||
|
--- a/third_party/blink/renderer/core/css/resolver/match_result.h
|
||||||
|
+++ b/third_party/blink/renderer/core/css/resolver/match_result.h
|
||||||
|
@@ -34,6 +34,7 @@
|
||||||
|
#include "third_party/blink/renderer/core/dom/tree_scope.h"
|
||||||
|
#include "third_party/blink/renderer/platform/heap/collection_support/heap_vector.h"
|
||||||
|
#include "third_party/blink/renderer/platform/heap/garbage_collected.h"
|
||||||
|
+#include "third_party/blink/renderer/platform/wtf/size_assertions.h"
|
||||||
|
#include "third_party/blink/renderer/platform/wtf/vector.h"
|
||||||
|
|
||||||
|
namespace blink {
|
||||||
|
@@ -88,8 +89,13 @@ struct CORE_EXPORT MatchedProperties {
|
||||||
|
Member<CSSPropertyValueSet> properties;
|
||||||
|
Data data_;
|
||||||
|
};
|
||||||
|
-static_assert(sizeof(MatchedProperties) <= 12,
|
||||||
|
- "MatchedProperties should not grow without thinking");
|
||||||
|
+
|
||||||
|
+struct SameSizeAsMatchedProperties {
|
||||||
|
+ Member<void*> properties;
|
||||||
|
+ uint8_t data_[8];
|
||||||
|
+};
|
||||||
|
+
|
||||||
|
+ASSERT_SIZE(MatchedProperties, SameSizeAsMatchedProperties);
|
||||||
|
|
||||||
|
} // namespace blink
|
||||||
|
|
||||||
|
diff --git a/third_party/blink/renderer/core/dom/element_data.cc b/third_party/blink/renderer/core/dom/element_data.cc
|
||||||
|
index 0e616444cbf92..6f3592bfa907b 100644
|
||||||
|
--- a/third_party/blink/renderer/core/dom/element_data.cc
|
||||||
|
+++ b/third_party/blink/renderer/core/dom/element_data.cc
|
||||||
|
@@ -46,7 +46,8 @@ struct SameSizeAsElementData final
|
||||||
|
: public GarbageCollected<SameSizeAsElementData> {
|
||||||
|
unsigned bitfield;
|
||||||
|
Member<void*> willbe_member;
|
||||||
|
- void* pointers[2];
|
||||||
|
+ SpaceSplitString class_names_;
|
||||||
|
+ void* pointers[1];
|
||||||
|
};
|
||||||
|
|
||||||
|
ASSERT_SIZE(ElementData, SameSizeAsElementData);
|
||||||
|
diff --git a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
|
||||||
|
index 98a9f6988ae3d..68b3c922cb362 100644
|
||||||
|
--- a/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
|
||||||
|
+++ b/third_party/blink/renderer/platform/fonts/shaping/shape_result.cc
|
||||||
|
@@ -75,7 +75,7 @@ struct SameSizeAsRunInfo {
|
||||||
|
void* pointers[2];
|
||||||
|
unsigned integer;
|
||||||
|
} glyph_data;
|
||||||
|
- void* pointer;
|
||||||
|
+ Member<void*> pointer;
|
||||||
|
Vector<int> vector;
|
||||||
|
int integers[6];
|
||||||
|
};
|
@ -0,0 +1,58 @@
|
|||||||
|
# system wide chromium flags
|
||||||
|
|
||||||
|
ARCH="$(arch)"
|
||||||
|
|
||||||
|
# GRAPHIC_DRIVER=[amd|intel|nvidia|default]
|
||||||
|
GRAPHIC_DRIVER=default
|
||||||
|
|
||||||
|
# WEB_DARKMODE=[on|off]
|
||||||
|
WEB_DARKMODE=off
|
||||||
|
|
||||||
|
# NATIVE_WAYLAND=[on|off]
|
||||||
|
NATIVE_WAYLAND=off
|
||||||
|
|
||||||
|
CHROMIUM_FLAGS=""
|
||||||
|
if [ "$NATIVE_WAYLAND" == "off" ] ; then
|
||||||
|
CHROMIUM_FLAGS+=" --enable-native-gpu-memory-buffers"
|
||||||
|
CHROMIUM_FLAGS+=" --enable-gpu-memory-buffer-video-frames"
|
||||||
|
CHROMIUM_FLAGS+=" --enable-zero-copy"
|
||||||
|
CHROMIUM_FLAGS+=" --ignore-gpu-blocklist --disable-gpu-driver-bug-workaround"
|
||||||
|
CHROMIUM_FLAGS+=" --enable-chrome-browser-cloud-management"
|
||||||
|
CHROMIUM_FLAGS+=" --enable-gpu-rasterization"
|
||||||
|
fi
|
||||||
|
|
||||||
|
FEATURES=""
|
||||||
|
|
||||||
|
case "$GRAPHIC_DRIVER" in
|
||||||
|
amd)
|
||||||
|
# Need new mesa with AMD multi planes support, is supported in fedora >= 40 (mesa-24.1.1 or newer)
|
||||||
|
# see https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26165
|
||||||
|
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=vulkan --enable-accelerated-video-decode"
|
||||||
|
FEATURES+="Vulkan,VulkanFromANGLE,DefaultANGLEVulkan,VaapiIgnoreDriverChecks,VaapiVideoDecoder,UseMultiPlaneFormatForHardwareVideo"
|
||||||
|
;;
|
||||||
|
nvidia)
|
||||||
|
# The NVIDIA VaAPI drivers are known to not support Chromium
|
||||||
|
# see https://crbug.com/1492880. This feature switch is
|
||||||
|
# provided for developers to test VaAPI drivers on NVIDIA GPUs
|
||||||
|
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
|
||||||
|
FEATURES+="VaapiVideoDecodeLinuxGL,VaapiVideoEncoder,VaapiOnNvidiaGPUs"
|
||||||
|
;;
|
||||||
|
intel)
|
||||||
|
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
|
||||||
|
FEATURES+="VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
|
||||||
|
;;
|
||||||
|
*)
|
||||||
|
CHROMIUM_FLAGS+=" --use-gl=angle --use-angle=gl"
|
||||||
|
FEATURES+="VaapiVideoEncoder,VaapiVideoDecodeLinuxGL"
|
||||||
|
;;
|
||||||
|
esac
|
||||||
|
|
||||||
|
# Web Dark mode
|
||||||
|
if [ "$WEB_DARKMODE" == "on" ] ; then
|
||||||
|
darktype="WebContentsForceDark:inversion_method/cielab_based/image_behavior/none/foreground_lightness_threshold/150/background_lightness_threshold/205"
|
||||||
|
FEATURES+=",$darktype"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [ "$ARCH" == "x86_64" ] ; then
|
||||||
|
CHROMIUM_FLAGS+=" --enable-features=$FEATURES"
|
||||||
|
fi
|
@ -0,0 +1,17 @@
|
|||||||
|
--- a/third_party/dawn/src/dawn/common/Platform.h
|
||||||
|
+++ b/third_party/dawn/src/dawn/common/Platform.h
|
||||||
|
@@ -159,10 +159,12 @@
|
||||||
|
#elif defined(__s390x__)
|
||||||
|
#define DAWN_PLATFORM_IS_S390X 1
|
||||||
|
|
||||||
|
-#elif defined(__PPC__)
|
||||||
|
-#define DAWN_PLATFORM_IS_PPC 1
|
||||||
|
+// Order matters here
|
||||||
|
+// PPC64 also defines PPC, which can lead to detection failures on ppc64le systems
|
||||||
|
#elif defined(__PPC64__)
|
||||||
|
#define DAWN_PLATFORM_IS_PPC64 1
|
||||||
|
+#elif defined(__PPC__)
|
||||||
|
+#define DAWN_PLATFORM_IS_PPC 1
|
||||||
|
|
||||||
|
#elif defined(__wasm32__)
|
||||||
|
#define DAWN_PLATFORM_IS_WASM32 1
|
@ -0,0 +1,17 @@
|
|||||||
|
diff -up third_party/ffmpeg/ffmpeg_generated.gni.me third_party/ffmpeg/ffmpeg_generated.gni
|
||||||
|
--- third_party/ffmpeg/ffmpeg_generated.gni.me 2024-07-19 23:49:33.776963768 +0200
|
||||||
|
+++ third_party/ffmpeg/ffmpeg_generated.gni 2024-07-19 23:50:14.377819007 +0200
|
||||||
|
@@ -14,10 +14,10 @@ ffmpeg_asm_sources = []
|
||||||
|
|
||||||
|
use_linux_config = is_linux || is_chromeos || is_fuchsia
|
||||||
|
|
||||||
|
-if (current_cpu == "arm64" || current_cpu == "x64" ||
|
||||||
|
+if ((current_cpu == "arm64") || (current_cpu == "x64") ||
|
||||||
|
(is_android && current_cpu == "arm" && arm_use_neon) ||
|
||||||
|
- (is_android && current_cpu == "x86") || is_apple || is_win ||
|
||||||
|
- use_linux_config) {
|
||||||
|
+ (is_android && current_cpu == "x86") || (is_apple) || (is_win) ||
|
||||||
|
+ (use_linux_config)) {
|
||||||
|
ffmpeg_c_sources += [
|
||||||
|
"libavcodec/ac3_channel_layout_tab.c",
|
||||||
|
"libavcodec/ac3_parser.c",
|
@ -0,0 +1,29 @@
|
|||||||
|
Index: chromium-128.0.6613.113/third_party/breakpad/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/third_party/breakpad/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/third_party/breakpad/BUILD.gn
|
||||||
|
@@ -782,7 +782,6 @@ if (is_linux || is_chromeos || is_androi
|
||||||
|
"breakpad/src/client/minidump_file_writer.h",
|
||||||
|
"breakpad/src/common/convert_UTF.cc",
|
||||||
|
"breakpad/src/common/convert_UTF.h",
|
||||||
|
- "breakpad/src/common/linux/breakpad_getcontext.S",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump.cc",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump.h",
|
||||||
|
"breakpad/src/common/linux/elfutils.cc",
|
||||||
|
@@ -814,6 +813,8 @@ if (is_linux || is_chromeos || is_androi
|
||||||
|
configs += [ "//build/config/compiler:no_chromium_code" ]
|
||||||
|
public_configs = [ ":client_config" ]
|
||||||
|
|
||||||
|
+ defines = [ "HAVE_GETCONTEXT" ]
|
||||||
|
+
|
||||||
|
if (current_cpu == "arm" && is_chromeos_ash) {
|
||||||
|
# Avoid running out of registers in
|
||||||
|
# linux_syscall_support.h:sys_clone()'s inline assembly.
|
||||||
|
@@ -871,7 +872,6 @@ if (is_linux || is_chromeos || is_androi
|
||||||
|
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest.cc",
|
||||||
|
"breakpad/src/client/linux/minidump_writer/minidump_writer_unittest_utils.cc",
|
||||||
|
"breakpad/src/client/linux/minidump_writer/proc_cpuinfo_reader_unittest.cc",
|
||||||
|
- "breakpad/src/common/linux/breakpad_getcontext_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/elf_core_dump_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/file_id_unittest.cc",
|
||||||
|
"breakpad/src/common/linux/linux_libc_support_unittest.cc",
|
@ -0,0 +1,12 @@
|
|||||||
|
Index: chromium-128.0.6613.113/build/config/BUILDCONFIG.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/build/config/BUILDCONFIG.gn
|
||||||
|
+++ chromium-128.0.6613.113/build/config/BUILDCONFIG.gn
|
||||||
|
@@ -138,7 +138,6 @@ declare_args() {
|
||||||
|
# Set to true when compiling with the Clang compiler.
|
||||||
|
is_clang = current_os != "linux" ||
|
||||||
|
(current_cpu != "s390x" && current_cpu != "s390" &&
|
||||||
|
- current_cpu != "ppc64" && current_cpu != "ppc" &&
|
||||||
|
current_cpu != "mips" && current_cpu != "mips64" &&
|
||||||
|
current_cpu != "riscv64")
|
||||||
|
|
@ -0,0 +1,39 @@
|
|||||||
|
Author: Daniel Richard G. <skunk@iSKUNK.ORG>
|
||||||
|
|
||||||
|
When building Chromium on unstable/ppc64el with ThinLTO enabled, this error
|
||||||
|
occurs in the final link:
|
||||||
|
|
||||||
|
ld.lld-16: error: Linking two modules of different data layouts:
|
||||||
|
$C_CXX_OBJECT is 'e-m:e-i64:64-n32:64-S128-v256:256:256-v512:512:512' whereas
|
||||||
|
$RUST_LIBRARY is 'e-m:e-Fn32-i64:64-n32:64-S128-v256:256:256-v512:512:512'
|
||||||
|
|
||||||
|
This is because the LLVM data layout for powerpc64le-unknown-linux-gnu has
|
||||||
|
evolved over time, gaining the "Fn32" bit that specifies function pointer
|
||||||
|
alignment. See the following source locations:
|
||||||
|
|
||||||
|
llvm-project/clang/lib/Basic/Targets/PPC.h
|
||||||
|
(class PPC64TargetInfo, under "Triple.getArch() == llvm::Triple::ppc64le")
|
||||||
|
|
||||||
|
rust/compiler/rustc_target/src/spec/powerpc64le_unknown_linux_gnu.rs
|
||||||
|
(note that this file was relocated in a later version)
|
||||||
|
|
||||||
|
This change occurred in clang-17, and rustc followed suit in 1.73.0. Since
|
||||||
|
we use an older clang and a newer rustc in our unstable build, we get an
|
||||||
|
inconsistency in data layouts when targeting this particular platform.
|
||||||
|
|
||||||
|
The error reported by the linker is not technically an error, however, only
|
||||||
|
a warning goosed up by a --fatal-warnings flag.
|
||||||
|
|
||||||
|
Index: chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/build/config/compiler/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||||
|
@@ -380,7 +380,7 @@ config("compiler") {
|
||||||
|
|
||||||
|
# Linker warnings.
|
||||||
|
if (fatal_linker_warnings && !is_apple && current_os != "aix" &&
|
||||||
|
- current_os != "zos") {
|
||||||
|
+ current_os != "zos" && current_cpu != "ppc64") {
|
||||||
|
ldflags += [ "-Wl,--fatal-warnings" ]
|
||||||
|
}
|
||||||
|
if (fatal_linker_warnings && is_apple) {
|
@ -0,0 +1,16 @@
|
|||||||
|
kIndex: chromium-114.0.5735.45/base/allocator/partition_allocator/partition_alloc.gni
|
||||||
|
===================================================================
|
||||||
|
Index: chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/base/allocator/partition_allocator/partition_alloc.gni
|
||||||
|
+++ chromium-128.0.6613.113/base/allocator/partition_allocator/partition_alloc.gni
|
||||||
|
@@ -19,7 +19,8 @@ if (is_nacl) {
|
||||||
|
# NaCl targets don't use 64-bit pointers.
|
||||||
|
has_64_bit_pointers = false
|
||||||
|
} else if (current_cpu == "x64" || current_cpu == "arm64" ||
|
||||||
|
- current_cpu == "loong64" || current_cpu == "riscv64") {
|
||||||
|
+ current_cpu == "loong64" || current_cpu == "riscv64" ||
|
||||||
|
+ current_cpu == "ppc64") {
|
||||||
|
has_64_bit_pointers = true
|
||||||
|
} else if (current_cpu == "x86" || current_cpu == "arm") {
|
||||||
|
has_64_bit_pointers = false
|
@ -0,0 +1,23 @@
|
|||||||
|
Index: chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
+++ chromium-128.0.6613.113/sandbox/linux/system_headers/ppc64_linux_syscalls.h
|
||||||
|
@@ -8,5 +8,18 @@
|
||||||
|
#include <asm/unistd.h>
|
||||||
|
|
||||||
|
//TODO: is it necessary to redefine syscall numbers for PPC64?
|
||||||
|
+// Needed for Ubuntu/Debian/Centos/RHEL:
|
||||||
|
+#if !defined(__NR_shmget)
|
||||||
|
+#define __NR_shmget 395
|
||||||
|
+#endif
|
||||||
|
+#if !defined(__NR_shmdt)
|
||||||
|
+#define __NR_shmdt 398
|
||||||
|
+#endif
|
||||||
|
+#if !defined(__NR_shmctl)
|
||||||
|
+#define __NR_shmctl 396
|
||||||
|
+#endif
|
||||||
|
+#if !defined(__NR_shmat)
|
||||||
|
+#define __NR_shmat 397
|
||||||
|
+#endif
|
||||||
|
|
||||||
|
#endif // SANDBOX_LINUX_SYSTEM_HEADERS_PPC64_LINUX_SYSCALLS_H_
|
@ -0,0 +1,34 @@
|
|||||||
|
Index: chromium-128.0.6613.113/build/toolchain/gcc_toolchain.gni
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/build/toolchain/gcc_toolchain.gni
|
||||||
|
+++ chromium-128.0.6613.113/build/toolchain/gcc_toolchain.gni
|
||||||
|
@@ -441,7 +441,13 @@ template("single_gcc_toolchain") {
|
||||||
|
# -soname flag is not available on aix ld
|
||||||
|
soname_flag = "-Wl,-soname=\"$soname\""
|
||||||
|
}
|
||||||
|
- link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}"
|
||||||
|
+ if (target_cpu == "ppc64") {
|
||||||
|
+ # Work around linker failures due to Rust libraries and the use of whole-archive
|
||||||
|
+ link_command = "$ld -shared $soname_flag -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}} -Wl,--end-group"
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ link_command = "$ld -shared $soname_flag {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" @\"$rspfile\" {{rlibs}}"
|
||||||
|
+ }
|
||||||
|
|
||||||
|
# Generate a map file to be used for binary size analysis.
|
||||||
|
# Map file adds ~10% to the link time on a z620.
|
||||||
|
@@ -553,7 +559,13 @@ template("single_gcc_toolchain") {
|
||||||
|
whole_archive_flag = "-Wl,--whole-archive"
|
||||||
|
no_whole_archive_flag = "-Wl,--no-whole-archive"
|
||||||
|
}
|
||||||
|
- command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\""
|
||||||
|
+ if (target_cpu == "ppc64") {
|
||||||
|
+ # Work around linker failures due to Rust libraries and the use of whole-archive
|
||||||
|
+ command = "$ld -shared -Wl,--start-group {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\" -Wl,--end-group"
|
||||||
|
+ }
|
||||||
|
+ else {
|
||||||
|
+ command = "$ld -shared {{ldflags}}${extra_ldflags} -o \"$unstripped_sofile\" $soname_flag @\"$rspfile\""
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (defined(invoker.strip)) {
|
||||||
|
strip_command = "${invoker.strip} -o \"$sofile\" \"$unstripped_sofile\""
|
@ -0,0 +1,15 @@
|
|||||||
|
author: Andres Salomon <dilinger@debian.org>
|
||||||
|
description: allow ppc64le to build by using proper rustc target
|
||||||
|
Index: chromium-128.0.6613.113/build/config/rust.gni
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/build/config/rust.gni
|
||||||
|
+++ chromium-128.0.6613.113/build/config/rust.gni
|
||||||
|
@@ -186,6 +186,8 @@ rust_abi_target = ""
|
||||||
|
if (is_linux || is_chromeos) {
|
||||||
|
if (current_cpu == "arm64") {
|
||||||
|
rust_abi_target = "aarch64-unknown-linux-gnu"
|
||||||
|
+ } else if (current_cpu == "ppc64") {
|
||||||
|
+ rust_abi_target = "powerpc64le-unknown-linux-gnu"
|
||||||
|
} else if (current_cpu == "x86") {
|
||||||
|
rust_abi_target = "i686-unknown-linux-gnu"
|
||||||
|
} else if (current_cpu == "x64") {
|
@ -0,0 +1,24 @@
|
|||||||
|
--- a/components/variations/proto/study.proto
|
||||||
|
+++ b/components/variations/proto/study.proto
|
||||||
|
@@ -264,6 +264,9 @@
|
||||||
|
// A Mac-only value, indicating an x86-64 binary running on an arm64 host
|
||||||
|
// via "Rosetta 2" binary translation.
|
||||||
|
TRANSLATED_X86_64 = 4;
|
||||||
|
+
|
||||||
|
+ // A POSIX-only value, indicating an OpenPOWER host
|
||||||
|
+ PPC64 = 5;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Enum to pass as optional bool.
|
||||||
|
--- a/components/variations/service/variations_field_trial_creator_base.cc
|
||||||
|
+++ b/components/variations/service/variations_field_trial_creator_base.cc
|
||||||
|
@@ -109,6 +109,9 @@
|
||||||
|
if (process_arch == "x86") {
|
||||||
|
return Study::X86_32;
|
||||||
|
}
|
||||||
|
+ if (process_arch == "PPC_64") {
|
||||||
|
+ return Study::PPC64;
|
||||||
|
+ }
|
||||||
|
if (process_arch == "x86_64") {
|
||||||
|
std::string os_arch = base::SysInfo::OperatingSystemArchitecture();
|
||||||
|
if (base::StartsWith(os_arch, "arm",
|
@ -0,0 +1,35 @@
|
|||||||
|
Index: chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/build/config/compiler/BUILD.gn
|
||||||
|
+++ chromium-128.0.6613.113/build/config/compiler/BUILD.gn
|
||||||
|
@@ -1844,7 +1844,7 @@ config("default_warnings") {
|
||||||
|
|
||||||
|
# -Wno-class-memaccess warns about hash table and vector in blink.
|
||||||
|
# But the violation is intentional.
|
||||||
|
- if (!is_nacl) {
|
||||||
|
+ if ((!is_nacl) && (current_cpu != "ppc64")) {
|
||||||
|
cflags_cc += [ "-Wno-class-memaccess" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
@@ -1854,7 +1854,9 @@ config("default_warnings") {
|
||||||
|
|
||||||
|
# Don't warn about "maybe" uninitialized. Clang doesn't include this
|
||||||
|
# in -Wall but gcc does, and it gives false positives.
|
||||||
|
- cflags += [ "-Wno-maybe-uninitialized" ]
|
||||||
|
+ if (current_cpu != "ppc64") {
|
||||||
|
+ cflags += [ "-Wno-maybe-uninitialized" ]
|
||||||
|
+ }
|
||||||
|
cflags += [ "-Wno-deprecated-declarations" ]
|
||||||
|
|
||||||
|
# -Wcomment gives too many false positives in the case a
|
||||||
|
@@ -1865,7 +1867,9 @@ config("default_warnings") {
|
||||||
|
|
||||||
|
# -Wpacked-not-aligned complains all generated mojom-shared-internal.h
|
||||||
|
# files.
|
||||||
|
- cflags += [ "-Wno-packed-not-aligned" ]
|
||||||
|
+ if (current_cpu != "ppc64") {
|
||||||
|
+ cflags += [ "-Wno-packed-not-aligned" ]
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
@ -0,0 +1,24 @@
|
|||||||
|
Index: chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-127.0.6533.88.orig/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc
|
||||||
|
+++ chromium-127.0.6533.88/base/allocator/partition_allocator/src/partition_alloc/partition_bucket.cc
|
||||||
|
@@ -492,6 +492,9 @@ uint8_t ComputeSystemPagesPerSlotSpanPre
|
||||||
|
partition_page_count <= kMaxPartitionPagesPerRegularSlotSpan;
|
||||||
|
partition_page_count++) {
|
||||||
|
size_t candidate_size = partition_page_count * PartitionPageSize();
|
||||||
|
+ if (candidate_size > kMaxBucketed) {
|
||||||
|
+ break;
|
||||||
|
+ }
|
||||||
|
size_t waste = candidate_size % slot_size;
|
||||||
|
if (waste <= .02 * SystemPageSize()) {
|
||||||
|
return partition_page_count * NumSystemPagesPerPartitionPage();
|
||||||
|
@@ -508,6 +511,9 @@ uint8_t ComputeSystemPagesPerSlotSpanPre
|
||||||
|
size_t system_page_count =
|
||||||
|
partition_page_count * NumSystemPagesPerPartitionPage() - slack;
|
||||||
|
size_t candidate_size = system_page_count * SystemPageSize();
|
||||||
|
+ if (candidate_size > kMaxBucketed) {
|
||||||
|
+ continue;
|
||||||
|
+ }
|
||||||
|
size_t waste = candidate_size % slot_size;
|
||||||
|
if (waste < best_waste) {
|
||||||
|
best_waste = waste;
|
@ -0,0 +1,718 @@
|
|||||||
|
Index: chromium-130.0.6723.44/third_party/skia/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/BUILD.gn
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/BUILD.gn
|
||||||
|
@@ -192,6 +192,12 @@ opts("lasx") {
|
||||||
|
cflags = [ "-mlasx" ]
|
||||||
|
}
|
||||||
|
|
||||||
|
+opts("vsx") {
|
||||||
|
+ enabled = current_cpu == "ppc64"
|
||||||
|
+ sources = skia_opts.vsx_sources
|
||||||
|
+ cflags = [ "-mcpu=power9", "-mtune=power9" ]
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
# Any feature of Skia that requires third-party code should be optional and use this template.
|
||||||
|
template("optional") {
|
||||||
|
if (invoker.enabled) {
|
||||||
|
@@ -1466,6 +1472,7 @@ skia_component("skia") {
|
||||||
|
":skx",
|
||||||
|
":typeface_fontations",
|
||||||
|
":vello",
|
||||||
|
+ ":vsx",
|
||||||
|
":webp_decode",
|
||||||
|
":wuffs",
|
||||||
|
":xml",
|
||||||
|
@@ -1637,7 +1644,10 @@ skia_static_library("pathkit") {
|
||||||
|
public_configs = [ ":skia_public" ]
|
||||||
|
configs = skia_library_configs
|
||||||
|
|
||||||
|
- deps = [ ":hsw" ]
|
||||||
|
+ deps = [
|
||||||
|
+ ":hsw",
|
||||||
|
+ ":vsx",
|
||||||
|
+ ]
|
||||||
|
|
||||||
|
sources = []
|
||||||
|
sources += skia_pathops_sources
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/gn/skia/BUILD.gn
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/gn/skia/BUILD.gn
|
||||||
|
@@ -167,6 +167,8 @@ config("default") {
|
||||||
|
"-mfpmath=sse",
|
||||||
|
]
|
||||||
|
ldflags += [ "-m32" ]
|
||||||
|
+ } else if (current_cpu == "ppc64") {
|
||||||
|
+ cflags += [ "-mcpu=power9", "-mtune=power9" ]
|
||||||
|
} else if (current_cpu == "loong64") {
|
||||||
|
cflags += [
|
||||||
|
"-mlsx",
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/include/core/SkTypes.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/include/core/SkTypes.h
|
||||||
|
@@ -178,4 +178,43 @@ static constexpr uint32_t SK_InvalidGenI
|
||||||
|
*/
|
||||||
|
static constexpr uint32_t SK_InvalidUniqueID = 0;
|
||||||
|
|
||||||
|
+//////////////////////////////////////////////////////////////////////
|
||||||
|
+// PPC defines
|
||||||
|
+
|
||||||
|
+#if defined(__powerpc64__) || defined(__PPC64__)
|
||||||
|
+ #ifndef SK_CPU_PPC64
|
||||||
|
+ #define SK_CPU_PPC64
|
||||||
|
+ #endif
|
||||||
|
+ #undef SK_CPU_SSE_LEVEL
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
+// Newer versions of clang and gcc for ppc64 ship with wrappers that translate
|
||||||
|
+// Intel vector intrinsics into PPC VSX instrinsics, so we can pretend to have
|
||||||
|
+// to be Intel. Currently, full API support for SSSE3 on POWER8 and later
|
||||||
|
+// processors.
|
||||||
|
+#if defined(__POWER8_VECTOR__) && defined(__has_include) && \
|
||||||
|
+ !defined(SK_CPU_SSE_LEVEL)
|
||||||
|
+
|
||||||
|
+ // Clang ships both Intel and PPC headers in its PPC version, storing the
|
||||||
|
+ // PPC compatibility in a subdirectory that the compiler will include before
|
||||||
|
+ // its standard library include directory.
|
||||||
|
+ #if (__has_include(<tmmintrin.h>) && !defined(__clang__)) || \
|
||||||
|
+ __has_include(<ppc_wrappers/tmmintrin.h>)
|
||||||
|
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSSE3
|
||||||
|
+ #elif (__has_include(<emmintrin.h>) && !defined(__clang__)) || \
|
||||||
|
+ __has_include(<ppc_wrappers/emmintrin.h>)
|
||||||
|
+ #define SK_CPU_SSE_LEVEL SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
+ #ifdef SK_CPU_SSE_LEVEL
|
||||||
|
+ #define SK_PPC64_HAS_SSE_COMPAT
|
||||||
|
+ #ifndef NO_WARN_X86_INTRINSICS
|
||||||
|
+ #define NO_WARN_X86_INTRINSICS
|
||||||
|
+ #endif
|
||||||
|
+ #if defined(__clang__)
|
||||||
|
+ #define SK_PPC64_CLANG_MFPPR_BUG
|
||||||
|
+ #endif
|
||||||
|
+ #endif
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/base/SkSpinlock.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/base/SkSpinlock.cpp
|
||||||
|
@@ -33,7 +33,8 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Renamed from "pause" to avoid conflict with function defined in unistd.h
|
||||||
|
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
+#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2 && \
|
||||||
|
+ !defined(SK_PPC64_CLANG_MFPPR_BUG)
|
||||||
|
#include <emmintrin.h>
|
||||||
|
static void do_pause() { _mm_pause(); }
|
||||||
|
#else
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkBitmapProcState_opts.h
|
||||||
|
@@ -21,7 +21,13 @@
|
||||||
|
// The rest are scattershot at the moment but I want to get them
|
||||||
|
// all migrated to be normal code inside SkBitmapProcState.cpp.
|
||||||
|
|
||||||
|
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
+#if defined(SK_PPC64_HAS_SSE_COMPAT)
|
||||||
|
+ #if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSSE3
|
||||||
|
+ #include <tmmintrin.h>
|
||||||
|
+ #else
|
||||||
|
+ #include <emmintrin.h>
|
||||||
|
+ #endif
|
||||||
|
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
#include <immintrin.h>
|
||||||
|
#elif defined(SK_ARM_HAS_NEON)
|
||||||
|
#include <arm_neon.h>
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkBlitRow_opts.h
|
||||||
|
@@ -69,7 +69,7 @@
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
- #include <immintrin.h>
|
||||||
|
+ #include <emmintrin.h>
|
||||||
|
|
||||||
|
static inline __m128i SkPMSrcOver_SSE2(const __m128i& src, const __m128i& dst) {
|
||||||
|
__m128i scale = _mm_sub_epi32(_mm_set1_epi32(256),
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkRasterPipeline_opts.h
|
||||||
|
@@ -1,5 +1,6 @@
|
||||||
|
/*
|
||||||
|
* Copyright 2018 Google Inc.
|
||||||
|
+ * Copyright 2023-2024 Raptor Engineering, LLC
|
||||||
|
*
|
||||||
|
* Use of this source code is governed by a BSD-style license that can be
|
||||||
|
* found in the LICENSE file.
|
||||||
|
@@ -75,6 +76,8 @@ using NoCtx = const void*;
|
||||||
|
#define SKRP_CPU_SCALAR
|
||||||
|
#elif defined(SK_ARM_HAS_NEON)
|
||||||
|
#define SKRP_CPU_NEON
|
||||||
|
+#elif defined(SK_PPC64_HAS_SSE_COMPAT)
|
||||||
|
+ #define SKRP_CPU_VSX
|
||||||
|
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SKX
|
||||||
|
#define SKRP_CPU_SKX
|
||||||
|
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_AVX2
|
||||||
|
@@ -97,6 +100,8 @@ using NoCtx = const void*;
|
||||||
|
#include <math.h>
|
||||||
|
#elif defined(SKRP_CPU_NEON)
|
||||||
|
#include <arm_neon.h>
|
||||||
|
+#elif defined(SKRP_CPU_VSX)
|
||||||
|
+ #include <emmintrin.h>
|
||||||
|
#elif defined(SKRP_CPU_LASX)
|
||||||
|
#include <lasxintrin.h>
|
||||||
|
#include <lsxintrin.h>
|
||||||
|
@@ -195,6 +200,184 @@ namespace SK_OPTS_NS {
|
||||||
|
ptr[3] = a;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#elif defined(SKRP_CPU_VSX)
|
||||||
|
+ // Since we know we're using Clang, we can use its vector extensions.
|
||||||
|
+ template <typename T> using V = T __attribute__((ext_vector_type(4)));
|
||||||
|
+ using F = V<float >;
|
||||||
|
+ using I32 = V< int32_t>;
|
||||||
|
+ using U64 = V<uint64_t>;
|
||||||
|
+ using U32 = V<uint32_t>;
|
||||||
|
+ using U16 = V<uint16_t>;
|
||||||
|
+ using U8 = V<uint8_t >;
|
||||||
|
+
|
||||||
|
+ // We polyfill a few routines that Clang doesn't build into ext_vector_types.
|
||||||
|
+ SI F min(F a, F b) { return vec_min(a,b); }
|
||||||
|
+ SI I32 min(I32 a, I32 b) { return vec_min(a,b); }
|
||||||
|
+ SI U32 min(U32 a, U32 b) { return vec_min(a,b); }
|
||||||
|
+ SI F max(F a, F b) { return vec_max(a,b); }
|
||||||
|
+ SI I32 max(I32 a, I32 b) { return vec_max(a,b); }
|
||||||
|
+ SI U32 max(U32 a, U32 b) { return vec_max(a,b); }
|
||||||
|
+
|
||||||
|
+ SI F abs_ (F v) { return vec_abs(v); }
|
||||||
|
+ SI I32 abs_ (I32 v) { return vec_abs(v); }
|
||||||
|
+ SI F rcp_approx(F v) { return vec_re(v); }
|
||||||
|
+ SI F rcp_precise (F v) { F e = rcp_approx(v); return e * (2.0f - v * e); }
|
||||||
|
+ SI F rsqrt_approx (F v) { return vec_rsqrte(v); }
|
||||||
|
+
|
||||||
|
+ SI U16 pack(U32 v) { return __builtin_convertvector(v, U16); }
|
||||||
|
+ SI U8 pack(U16 v) { return __builtin_convertvector(v, U8); }
|
||||||
|
+
|
||||||
|
+ SI F if_then_else(I32 c, F t, F e) {
|
||||||
|
+ return vec_or((vector float)vec_and((vector float)c, (vector float)t), (vector float)vec_andc((vector float)e, (vector float)c));
|
||||||
|
+ }
|
||||||
|
+ SI I32 if_then_else(I32 c, I32 t, I32 e) {
|
||||||
|
+ return vec_or((vector unsigned int)vec_and((vector unsigned int)c, (vector unsigned int)t), (vector unsigned int)vec_andc((vector unsigned int)e, (vector unsigned int)c));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // In both AltiVec and SSE there is no horizontal element compare, unlike ARM. Fall back to scalar operations here...
|
||||||
|
+ SI bool any(I32 c) {
|
||||||
|
+ if (vec_extract((U32)c, 0) != 0) return 1;
|
||||||
|
+ if (vec_extract((U32)c, 1) != 0) return 1;
|
||||||
|
+ if (vec_extract((U32)c, 2) != 0) return 1;
|
||||||
|
+ if (vec_extract((U32)c, 3) != 0) return 1;
|
||||||
|
+ return 0;
|
||||||
|
+ }
|
||||||
|
+ SI bool all(I32 c) {
|
||||||
|
+ if (vec_extract((U32)c, 0) == 0) return 0;
|
||||||
|
+ if (vec_extract((U32)c, 1) == 0) return 0;
|
||||||
|
+ if (vec_extract((U32)c, 2) == 0) return 0;
|
||||||
|
+ if (vec_extract((U32)c, 3) == 0) return 0;
|
||||||
|
+ return 1;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI F mad(F f, F m, F a) { return vec_madd(f,m,a); }
|
||||||
|
+ SI F nmad(F f, F m, F a) { return vec_nmsub(f,m,a); }
|
||||||
|
+ SI F floor_(F v) { return vec_floor(v); }
|
||||||
|
+ SI F ceil_(F v) { return vec_ceil(v); }
|
||||||
|
+ SI F sqrt_(F v) { return vec_sqrt(v); }
|
||||||
|
+ SI I32 iround(F v) { return vec_cts((vector float)vec_rint(v), 0); }
|
||||||
|
+ SI U32 round(F v) { return vec_ctu((vector float)vec_rint(v), 0); }
|
||||||
|
+ SI U32 round(F v, F scale) { return vec_cts((vector float)vec_rint(v*scale), 0); }
|
||||||
|
+
|
||||||
|
+ template <typename T>
|
||||||
|
+ SI V<T> gather(const T* p, U32 ix) {
|
||||||
|
+ return {p[ix[0]], p[ix[1]], p[ix[2]], p[ix[3]]};
|
||||||
|
+ }
|
||||||
|
+ template <typename V, typename S>
|
||||||
|
+ SI void scatter_masked(V src, S* dst, U32 ix, I32 mask) {
|
||||||
|
+ V before = gather(dst, ix);
|
||||||
|
+ V after = if_then_else(mask, src, before);
|
||||||
|
+ dst[ix[0]] = after[0];
|
||||||
|
+ dst[ix[1]] = after[1];
|
||||||
|
+ dst[ix[2]] = after[2];
|
||||||
|
+ dst[ix[3]] = after[3];
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ // TODO
|
||||||
|
+ // Finish converting these functions from the SSE translation layer to native AltiVec / VSX
|
||||||
|
+ SI void load2(const uint16_t* ptr, U16* r, U16* g) {
|
||||||
|
+ __m128i _01;
|
||||||
|
+ _01 = _mm_loadu_si128(((__m128i*)ptr) + 0); // r0 g0 r1 g1 r2 g2 r3 g3
|
||||||
|
+ auto rg01_23 = _mm_shufflelo_epi16(_01, 0xD8); // r0 r1 g0 g1 r2 g2 r3 g3
|
||||||
|
+ auto rg = _mm_shufflehi_epi16(rg01_23, 0xD8); // r0 r1 g0 g1 r2 r3 g2 g3
|
||||||
|
+
|
||||||
|
+ auto R = _mm_shuffle_epi32(rg, 0x88); // r0 r1 r2 r3 r0 r1 r2 r3
|
||||||
|
+ auto G = _mm_shuffle_epi32(rg, 0xDD); // g0 g1 g2 g3 g0 g1 g2 g3
|
||||||
|
+ *r = sk_unaligned_load<U16>(&R);
|
||||||
|
+ *g = sk_unaligned_load<U16>(&G);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void store2(uint16_t* ptr, U16 r, U16 g) {
|
||||||
|
+ U32 rg = _mm_unpacklo_epi16(widen_cast<__m128i>(r), widen_cast<__m128i>(g));
|
||||||
|
+ _mm_storeu_si128((__m128i*)ptr + 0, rg);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void load3(const uint16_t* ptr, U16* r, U16* g, U16* b) {
|
||||||
|
+ __m128i _0, _1, _2, _3;
|
||||||
|
+ // Load slightly weirdly to make sure we don't load past the end of 4x48 bits.
|
||||||
|
+ auto _01 = _mm_loadu_si128((const __m128i*)(ptr + 0)) ,
|
||||||
|
+ _23 = _mm_srli_si128(_mm_loadu_si128((const __m128i*)(ptr + 4)), 4);
|
||||||
|
+
|
||||||
|
+ // Each _N holds R,G,B for pixel N in its lower 3 lanes (upper 5 are ignored).
|
||||||
|
+ _0 = _01;
|
||||||
|
+ _1 = _mm_srli_si128(_01, 6);
|
||||||
|
+ _2 = _23;
|
||||||
|
+ _3 = _mm_srli_si128(_23, 6);
|
||||||
|
+
|
||||||
|
+ // De-interlace to R,G,B.
|
||||||
|
+ auto _02 = _mm_unpacklo_epi16(_0, _2), // r0 r2 g0 g2 b0 b2 xx xx
|
||||||
|
+ _13 = _mm_unpacklo_epi16(_1, _3); // r1 r3 g1 g3 b1 b3 xx xx
|
||||||
|
+
|
||||||
|
+ auto R = _mm_unpacklo_epi16(_02, _13), // r0 r1 r2 r3 g0 g1 g2 g3
|
||||||
|
+ G = _mm_srli_si128(R, 8),
|
||||||
|
+ B = _mm_unpackhi_epi16(_02, _13); // b0 b1 b2 b3 xx xx xx xx
|
||||||
|
+
|
||||||
|
+ *r = sk_unaligned_load<U16>(&R);
|
||||||
|
+ *g = sk_unaligned_load<U16>(&G);
|
||||||
|
+ *b = sk_unaligned_load<U16>(&B);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void load4(const uint16_t* ptr, U16* r, U16* g, U16* b, U16* a) {
|
||||||
|
+ __m128i _01, _23;
|
||||||
|
+ _01 = _mm_loadu_si128(((__m128i*)ptr) + 0); // r0 g0 b0 a0 r1 g1 b1 a1
|
||||||
|
+ _23 = _mm_loadu_si128(((__m128i*)ptr) + 1); // r2 g2 b2 a2 r3 g3 b3 a3
|
||||||
|
+
|
||||||
|
+ auto _02 = _mm_unpacklo_epi16(_01, _23), // r0 r2 g0 g2 b0 b2 a0 a2
|
||||||
|
+ _13 = _mm_unpackhi_epi16(_01, _23); // r1 r3 g1 g3 b1 b3 a1 a3
|
||||||
|
+
|
||||||
|
+ auto rg = _mm_unpacklo_epi16(_02, _13), // r0 r1 r2 r3 g0 g1 g2 g3
|
||||||
|
+ ba = _mm_unpackhi_epi16(_02, _13); // b0 b1 b2 b3 a0 a1 a2 a3
|
||||||
|
+
|
||||||
|
+ *r = sk_unaligned_load<U16>((uint16_t*)&rg + 0);
|
||||||
|
+ *g = sk_unaligned_load<U16>((uint16_t*)&rg + 4);
|
||||||
|
+ *b = sk_unaligned_load<U16>((uint16_t*)&ba + 0);
|
||||||
|
+ *a = sk_unaligned_load<U16>((uint16_t*)&ba + 4);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void store4(uint16_t* ptr, U16 r, U16 g, U16 b, U16 a) {
|
||||||
|
+ auto rg = _mm_unpacklo_epi16(widen_cast<__m128i>(r), widen_cast<__m128i>(g)),
|
||||||
|
+ ba = _mm_unpacklo_epi16(widen_cast<__m128i>(b), widen_cast<__m128i>(a));
|
||||||
|
+
|
||||||
|
+ _mm_storeu_si128((__m128i*)ptr + 0, _mm_unpacklo_epi32(rg, ba));
|
||||||
|
+ _mm_storeu_si128((__m128i*)ptr + 1, _mm_unpackhi_epi32(rg, ba));
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void load2(const float* ptr, F* r, F* g) {
|
||||||
|
+ F _01, _23;
|
||||||
|
+ _01 = _mm_loadu_ps(ptr + 0);
|
||||||
|
+ _23 = _mm_loadu_ps(ptr + 4);
|
||||||
|
+ *r = _mm_shuffle_ps(_01, _23, 0x88);
|
||||||
|
+ *g = _mm_shuffle_ps(_01, _23, 0xDD);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void store2(float* ptr, F r, F g) {
|
||||||
|
+ F _01 = _mm_unpacklo_ps(r, g),
|
||||||
|
+ _23 = _mm_unpackhi_ps(r, g);
|
||||||
|
+ _mm_storeu_ps(ptr + 0, _01);
|
||||||
|
+ _mm_storeu_ps(ptr + 4, _23);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void load4(const float* ptr, F* r, F* g, F* b, F* a) {
|
||||||
|
+ F _0, _1, _2, _3;
|
||||||
|
+ _0 = _mm_loadu_ps(ptr + 0);
|
||||||
|
+ _1 = _mm_loadu_ps(ptr + 4);
|
||||||
|
+ _2 = _mm_loadu_ps(ptr + 8);
|
||||||
|
+ _3 = _mm_loadu_ps(ptr +12);
|
||||||
|
+ _MM_TRANSPOSE4_PS(_0,_1,_2,_3);
|
||||||
|
+ *r = _0;
|
||||||
|
+ *g = _1;
|
||||||
|
+ *b = _2;
|
||||||
|
+ *a = _3;
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+ SI void store4(float* ptr, F r, F g, F b, F a) {
|
||||||
|
+ _MM_TRANSPOSE4_PS(r,g,b,a);
|
||||||
|
+ _mm_storeu_ps(ptr + 0, r);
|
||||||
|
+ _mm_storeu_ps(ptr + 4, g);
|
||||||
|
+ _mm_storeu_ps(ptr + 8, b);
|
||||||
|
+ _mm_storeu_ps(ptr +12, a);
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
#elif defined(SKRP_CPU_NEON)
|
||||||
|
template <typename T> using V = Vec<4, T>;
|
||||||
|
using F = V<float >;
|
||||||
|
@@ -1401,6 +1584,15 @@ SI F from_half(U16 h) {
|
||||||
|
#elif defined(SKRP_CPU_HSW)
|
||||||
|
return _mm256_cvtph_ps((__m128i)h);
|
||||||
|
|
||||||
|
+// Disabled for now as this is not a particularly hot function
|
||||||
|
+// and there is no good reason to lock Chromium to POWER9+ yet.
|
||||||
|
+#elif 0 && defined(SKRP_CPU_VSX) && __has_builtin(__builtin_vsx_xvcvhpsp)
|
||||||
|
+ #if defined(SK_CPU_LENDIAN)
|
||||||
|
+ return __builtin_vsx_xvcvhpsp({h[0], 0, h[1], 0, h[2], 0, h[3], 0});
|
||||||
|
+ #else
|
||||||
|
+ return __builtin_vsx_xvcvhpsp({0, h[0], 0, h[1], 0, h[2], 0, h[3]});
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
// Remember, a half is 1-5-10 (sign-exponent-mantissa) with 15 exponent bias.
|
||||||
|
U32 sem = expand(h),
|
||||||
|
@@ -1424,6 +1616,16 @@ SI U16 to_half(F f) {
|
||||||
|
#elif defined(SKRP_CPU_HSW)
|
||||||
|
return (U16)_mm256_cvtps_ph(f, _MM_FROUND_CUR_DIRECTION);
|
||||||
|
|
||||||
|
+// Disabled for now as this is not a particularly hot function
|
||||||
|
+// and there is no good reason to lock Chromium to POWER9+ yet.
|
||||||
|
+#elif 0 && defined(SKRP_CPU_VSX) && __has_builtin(__builtin_vsx_xvcvsphp)
|
||||||
|
+ __vector unsigned short v = __builtin_vsx_xvcvsphp(f);
|
||||||
|
+ #if defined(SK_CPU_LENDIAN)
|
||||||
|
+ return U16{v[0], v[2], v[4], v[6]};
|
||||||
|
+ #else
|
||||||
|
+ return U16{v[1], v[3], v[5], v[7]};
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
#else
|
||||||
|
// Remember, a float is 1-8-23 (sign-exponent-mantissa) with 127 exponent bias.
|
||||||
|
U32 sem = sk_bit_cast<U32>(f),
|
||||||
|
@@ -1499,7 +1701,7 @@ static constexpr size_t N = sizeof(F) /
|
||||||
|
// instead of {b,a} on the stack. Narrow stages work best for __vectorcall.
|
||||||
|
#define ABI __vectorcall
|
||||||
|
#define SKRP_NARROW_STAGES 1
|
||||||
|
-#elif defined(__x86_64__) || defined(SK_CPU_ARM64) || defined(SK_CPU_LOONGARCH)
|
||||||
|
+#elif defined(__x86_64__) || defined(SK_CPU_ARM64) || defined(SK_CPU_LOONGARCH) || defined(SK_CPU_PPC64)
|
||||||
|
// These platforms are ideal for wider stages, and their default ABI is ideal.
|
||||||
|
#define ABI
|
||||||
|
#define SKRP_NARROW_STAGES 0
|
||||||
|
@@ -5481,6 +5683,10 @@ SI F sqrt_(F x) {
|
||||||
|
float32x4_t lo,hi;
|
||||||
|
split(x, &lo,&hi);
|
||||||
|
return join<F>(sqrt(lo), sqrt(hi));
|
||||||
|
+#elif defined(SKRP_CPU_VSX)
|
||||||
|
+ vector float lo,hi;
|
||||||
|
+ split(x, &lo,&hi);
|
||||||
|
+ return join<F>(vec_sqrt(lo), vec_sqrt(hi));
|
||||||
|
#elif defined(SKRP_CPU_LASX)
|
||||||
|
__m256 lo,hi;
|
||||||
|
split(x, &lo,&hi);
|
||||||
|
@@ -5512,6 +5718,10 @@ SI F floor_(F x) {
|
||||||
|
__m128 lo,hi;
|
||||||
|
split(x, &lo,&hi);
|
||||||
|
return join<F>(_mm_floor_ps(lo), _mm_floor_ps(hi));
|
||||||
|
+#elif defined(SKRP_CPU_VSX)
|
||||||
|
+ vector float lo,hi;
|
||||||
|
+ split(x, &lo,&hi);
|
||||||
|
+ return join<F>(vec_floor(lo), vec_floor(hi));
|
||||||
|
#elif defined(SKRP_CPU_LASX)
|
||||||
|
__m256 lo,hi;
|
||||||
|
split(x, &lo,&hi);
|
||||||
|
@@ -5531,6 +5741,7 @@ SI F floor_(F x) {
|
||||||
|
// (2 * a * b + (1 << 15)) >> 16
|
||||||
|
// The result is a number on [-1, 1).
|
||||||
|
// Note: on neon this is a saturating multiply while the others are not.
|
||||||
|
+// Note: for POWER, the code below was borrowed from emmintrin.h
|
||||||
|
SI I16 scaled_mult(I16 a, I16 b) {
|
||||||
|
#if defined(SKRP_CPU_SKX)
|
||||||
|
return (I16)_mm256_mulhrs_epi16((__m256i)a, (__m256i)b);
|
||||||
|
@@ -5542,6 +5753,22 @@ SI I16 scaled_mult(I16 a, I16 b) {
|
||||||
|
return vqrdmulhq_s16(a, b);
|
||||||
|
#elif defined(SKRP_CPU_NEON)
|
||||||
|
return vqrdmulhq_s16(a, b);
|
||||||
|
+#elif defined(SKRP_CPU_VSX)
|
||||||
|
+ const vector unsigned int shift = vec_splats((unsigned int)14);
|
||||||
|
+ const vector int ones = vec_splats((signed int)1);
|
||||||
|
+ vector int c = vec_unpackh((vector short)a);
|
||||||
|
+ vector int d = vec_unpackh((vector short)b);
|
||||||
|
+ vector int e = vec_unpackl((vector short)b);
|
||||||
|
+ c = vec_mul(c, d);
|
||||||
|
+ d = vec_unpackl((vector short)a);
|
||||||
|
+ d = vec_mul(d, e);
|
||||||
|
+ c = vec_sr(c, shift);
|
||||||
|
+ d = vec_sr(d, shift);
|
||||||
|
+ c = vec_add(c, ones);
|
||||||
|
+ c = vec_sr(c,(vector unsigned int)ones);
|
||||||
|
+ d = vec_add(d, ones);
|
||||||
|
+ d = vec_sr(d,(vector unsigned int)ones);
|
||||||
|
+ return vec_pack(c, d);
|
||||||
|
#elif defined(SKRP_CPU_LASX)
|
||||||
|
I16 res = __lasx_xvmuh_h(a, b);
|
||||||
|
return __lasx_xvslli_h(res, 1);
|
||||||
|
@@ -5569,7 +5796,26 @@ SI U16 constrained_add(I16 a, U16 b) {
|
||||||
|
SkASSERT(-ib <= ia && ia <= 65535 - ib);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
+
|
||||||
|
+ // Technically, trying to add a signed and unsigned vector invokes undefined behavior
|
||||||
|
+ // Just because it sort of seems to work on Intel/ARM on Clang doesn't mean it works everywhere...
|
||||||
|
+ // FIXME: For added fun, the existing Skia unit tests do NOT properly test for issues in the
|
||||||
|
+ // lowp bilerp path. Investigate and write an appropriate test case...
|
||||||
|
+#if defined(SKRP_CPU_VSX)
|
||||||
|
+ // Most POWER compilers end up doing some kind of width promotion that causes memory corruption
|
||||||
|
+ // and/or incorrect results. This shows up as snow and general graphics corruption, especially
|
||||||
|
+ // noticeable when trying to display a PNG at less than 50% size (resize the browser window down
|
||||||
|
+ // until the artifacts appear).
|
||||||
|
+ // Take the (likely invisible) loss of precision, convert b to a signed int immediately, and do
|
||||||
|
+ // a proper saturated add here. This seems to fully resolve the issue for all test cases Raptor
|
||||||
|
+ // has seen so far...
|
||||||
|
+ // In half precision mode, this function expects both input arguments to have been divided by
|
||||||
|
+ // two prior to being called, and returns the output without being multiplied back up by two
|
||||||
|
+ return vec_adds(a, (I16)b);
|
||||||
|
+#else
|
||||||
|
+ // Hic Sunt Dragones!
|
||||||
|
return b + sk_bit_cast<U16>(a);
|
||||||
|
+#endif
|
||||||
|
}
|
||||||
|
|
||||||
|
SI F fract(F x) { return x - floor_(x); }
|
||||||
|
@@ -6582,8 +6828,14 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
|
||||||
|
// 2^-8 * v = 2^-9 * (tx*(R - L) + (R + L))
|
||||||
|
// v = 1/2 * (tx*(R - L) + (R + L))
|
||||||
|
auto lerpX = [&](U16 left, U16 right) -> U16 {
|
||||||
|
+#if defined(SKRP_CPU_VSX)
|
||||||
|
+ // constrained_add() on POWER is run in half precision mode to avoid undefined behavior
|
||||||
|
+ I16 width = (I16)(right - left) << 6;
|
||||||
|
+ U16 middle = (right + left) << 6;
|
||||||
|
+#else
|
||||||
|
I16 width = (I16)(right - left) << 7;
|
||||||
|
U16 middle = (right + left) << 7;
|
||||||
|
+#endif
|
||||||
|
// The constrained_add is the most subtle part of lerp. The first term is on the interval
|
||||||
|
// [-1, 1), and the second term is on the interval is on the interval [0, 1) because
|
||||||
|
// both terms are too high by a factor of 2 which will be handled below. (Both R and L are
|
||||||
|
@@ -6595,7 +6847,12 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
|
||||||
|
U16 v2 = constrained_add(scaled_mult(tx, width), middle) + 1;
|
||||||
|
// Divide by 2 to calculate v and at the same time bring the intermediate value onto the
|
||||||
|
// interval [0, 1/2] to set up for the lerpY.
|
||||||
|
+#if defined(SKRP_CPU_VSX)
|
||||||
|
+ // constrained_add() on POWER is run in half precision mode to avoid undefined behavior
|
||||||
|
+ return v2;
|
||||||
|
+#else
|
||||||
|
return v2 >> 1;
|
||||||
|
+#endif
|
||||||
|
};
|
||||||
|
|
||||||
|
const uint32_t* ptr;
|
||||||
|
@@ -6629,9 +6886,15 @@ STAGE_GP(bilerp_clamp_8888, const SkRast
|
||||||
|
I16 width = (I16)bottom - (I16)top;
|
||||||
|
U16 middle = bottom + top;
|
||||||
|
// Add + 0x80 for rounding.
|
||||||
|
+#if defined(SKRP_CPU_VSX)
|
||||||
|
+ // constrained_add() on POWER is run in half precision mode to avoid undefined behavior
|
||||||
|
+ U16 blend = constrained_add(scaled_mult(ty, width) / 2, middle / 2) + (0x80 / 2);
|
||||||
|
+ return blend >> 7;
|
||||||
|
+#else
|
||||||
|
U16 blend = constrained_add(scaled_mult(ty, width), middle) + 0x80;
|
||||||
|
-
|
||||||
|
return blend >> 8;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
};
|
||||||
|
|
||||||
|
r = lerpY(topR, bottomR);
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/base/SkVx.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/base/SkVx.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/base/SkVx.h
|
||||||
|
@@ -42,7 +42,13 @@
|
||||||
|
|
||||||
|
#if SKVX_USE_SIMD
|
||||||
|
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
|
||||||
|
- #include <immintrin.h>
|
||||||
|
+ #if __PPC64__
|
||||||
|
+ #include <mmintrin.h>
|
||||||
|
+ #include <emmintrin.h>
|
||||||
|
+ #include <tmmintrin.h>
|
||||||
|
+ #else
|
||||||
|
+ #include <immintrin.h>
|
||||||
|
+ #endif
|
||||||
|
#elif defined(SK_ARM_HAS_NEON)
|
||||||
|
#include <arm_neon.h>
|
||||||
|
#elif defined(__wasm_simd128__)
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts_ssse3.cpp
|
||||||
|
@@ -9,7 +9,7 @@
|
||||||
|
#include "src/core/SkBlitMask.h"
|
||||||
|
#include "src/core/SkOptsTargets.h"
|
||||||
|
|
||||||
|
-#if defined(SK_CPU_X86) && !defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
+#if (defined(SK_CPU_X86) || defined(SK_CPU_PPC64)) && !defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
|
||||||
|
// The order of these includes is important:
|
||||||
|
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkSwizzler_opts_ssse3.cpp
|
||||||
|
@@ -10,7 +10,7 @@
|
||||||
|
#include "src/core/SkOptsTargets.h"
|
||||||
|
#include "src/core/SkSwizzlePriv.h"
|
||||||
|
|
||||||
|
-#if defined(SK_CPU_X86) && \
|
||||||
|
+#if (defined(SK_CPU_X86) || defined(SK_CPU_PPC64)) && \
|
||||||
|
!defined(SK_ENABLE_OPTIMIZE_SIZE) && \
|
||||||
|
SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||||
|
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitMask_opts.cpp
|
||||||
|
@@ -25,7 +25,7 @@ namespace SkOpts {
|
||||||
|
static bool init() {
|
||||||
|
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
// All Init_foo functions are omitted when optimizing for size
|
||||||
|
- #elif defined(SK_CPU_X86)
|
||||||
|
+ #elif defined(SK_CPU_X86) || defined(SK_CPU_PPC64)
|
||||||
|
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||||
|
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BlitMask_ssse3(); }
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts.cpp
|
||||||
|
@@ -27,7 +27,7 @@ namespace SkOpts {
|
||||||
|
static bool init() {
|
||||||
|
#if defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
// All Init_foo functions are omitted when optimizing for size
|
||||||
|
- #elif defined(SK_CPU_X86)
|
||||||
|
+ #elif defined(SK_CPU_X86) || defined(SK_CPU_PPC64)
|
||||||
|
#if SK_CPU_SSE_LEVEL < SK_CPU_SSE_LEVEL_SSSE3
|
||||||
|
if (SkCpu::Supports(SkCpu::SSSE3)) { Init_BitmapProcState_ssse3(); }
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkCpu.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkCpu.h
|
||||||
|
@@ -60,7 +60,7 @@ inline bool SkCpu::Supports(uint32_t mas
|
||||||
|
|
||||||
|
// If we mask in compile-time known lower limits, the compiler can
|
||||||
|
// often compile away this entire function.
|
||||||
|
-#if SK_CPU_X86
|
||||||
|
+#if SK_CPU_X86 || defined(SK_CPU_PPC64)
|
||||||
|
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
|
||||||
|
features |= SSE1;
|
||||||
|
#endif
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBitmapProcState_opts_ssse3.cpp
|
||||||
|
@@ -8,7 +8,7 @@
|
||||||
|
#include "include/private/base/SkFeatures.h"
|
||||||
|
#include "src/core/SkOptsTargets.h"
|
||||||
|
|
||||||
|
-#if defined(SK_CPU_X86) && !defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
+#if (defined(SK_CPU_X86) || defined(SK_CPU_PPC64)) && !defined(SK_ENABLE_OPTIMIZE_SIZE)
|
||||||
|
|
||||||
|
// The order of these includes is important:
|
||||||
|
// 1) Select the target CPU architecture by defining SK_OPTS_TARGET and including SkOpts_SetTarget
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/include/private/base/SkFeatures.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/include/private/base/SkFeatures.h
|
||||||
|
@@ -63,6 +63,8 @@
|
||||||
|
|
||||||
|
#if defined(__i386) || defined(_M_IX86) || defined(__x86_64__) || defined(_M_X64)
|
||||||
|
#define SK_CPU_X86 1
|
||||||
|
+#elif defined(__powerpc64__) || defined(__PPC64__)
|
||||||
|
+ #define SK_CPU_PPC64 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if defined(__loongarch__) || defined (__loongarch64)
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/modules/skcms/src/skcms_internals.h
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/modules/skcms/src/skcms_internals.h
|
||||||
|
@@ -47,6 +47,7 @@ extern "C" {
|
||||||
|
&& !defined(__EMSCRIPTEN__) \
|
||||||
|
&& !defined(__arm__) \
|
||||||
|
&& !defined(__riscv) \
|
||||||
|
+ && !defined(__powerpc64__) \
|
||||||
|
&& !defined(__loongarch__) \
|
||||||
|
&& !defined(_WIN32) && !defined(__SYMBIAN32__)
|
||||||
|
#define SKCMS_HAS_MUSTTAIL 1
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/opts/SkSwizzler_opts.inc
|
||||||
|
@@ -14,7 +14,10 @@
|
||||||
|
#include <cmath>
|
||||||
|
#include <utility>
|
||||||
|
|
||||||
|
-#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
|
||||||
|
+#if defined(SK_PPC64_HAS_SSE_COMPAT)
|
||||||
|
+ #include <emmintrin.h>
|
||||||
|
+ #include <tmmintrin.h>
|
||||||
|
+#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1
|
||||||
|
#include <immintrin.h>
|
||||||
|
#elif defined(SK_ARM_HAS_NEON)
|
||||||
|
#include <arm_neon.h>
|
||||||
|
@@ -65,6 +68,33 @@ SI float reciprocal_alpha_times_255(floa
|
||||||
|
SI float reciprocal_alpha(float a) {
|
||||||
|
return reciprocal_alpha_portable(a);
|
||||||
|
}
|
||||||
|
+#elif defined(SK_PPC64_HAS_SSE_COMPAT)
|
||||||
|
+// -- VSX -- Harden against timing attacks
|
||||||
|
+SK_NO_SANITIZE("float-divide-by-zero")
|
||||||
|
+static inline float reciprocal_alpha_times_255(float a) {
|
||||||
|
+ SkASSERT(0 <= a && a <= 255);
|
||||||
|
+
|
||||||
|
+ vector float vA{a,a,a,a};
|
||||||
|
+ vector float vB{255.0f,255.0f,255.0f,255.0f};
|
||||||
|
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
|
||||||
|
+ vector float q = vec_div(vB, vA);
|
||||||
|
+ vector float vCmp{static_cast<float>(vA != vC)};
|
||||||
|
+
|
||||||
|
+ return vec_and(vCmp, q)[0];
|
||||||
|
+}
|
||||||
|
+
|
||||||
|
+SK_NO_SANITIZE("float-divide-by-zero")
|
||||||
|
+static inline float reciprocal_alpha(float a) {
|
||||||
|
+ SkASSERT(0 <= a && a <= 1);
|
||||||
|
+
|
||||||
|
+ vector float vA{a,a,a,a};
|
||||||
|
+ vector float vB{1.0f,1.0f,1.0f,1.0f};
|
||||||
|
+ vector float vC{0.0f,0.0f,0.0f,0.0f};
|
||||||
|
+ vector float q = vec_div(vB, vA);
|
||||||
|
+ vector float vCmp{static_cast<float>(vA != vC)};
|
||||||
|
+
|
||||||
|
+ return vec_and(vCmp, q)[0];
|
||||||
|
+}
|
||||||
|
#elif SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE1 && (defined(__clang__) || !defined(_MSC_VER))
|
||||||
|
// -- SSE -- Harden against timing attacks -- MSVC is not supported.
|
||||||
|
using F4 = __m128;
|
||||||
|
Index: chromium-130.0.6723.44/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||||
|
===================================================================
|
||||||
|
--- chromium-130.0.6723.44.orig/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||||
|
+++ chromium-130.0.6723.44/third_party/skia/src/core/SkBlitter_ARGB32.cpp
|
||||||
|
@@ -126,6 +126,16 @@ static inline SkPMColor blend_lcd16_opaq
|
||||||
|
#if SK_CPU_SSE_LEVEL >= SK_CPU_SSE_LEVEL_SSE2
|
||||||
|
#include <emmintrin.h>
|
||||||
|
|
||||||
|
+#if defined(SK_CPU_PPC64)
|
||||||
|
+ /* Load signed 64-bit integer from P into vector element 0. The address need not be 16-byte aligned. */
|
||||||
|
+ extern __inline __m128i
|
||||||
|
+ __attribute__((__gnu_inline__, __always_inline__, __artificial__))
|
||||||
|
+ _mm_loadu_si64 (void const *__P)
|
||||||
|
+ {
|
||||||
|
+ return _mm_set_epi64((__m64)0LL, *(__m64 *)__P);
|
||||||
|
+ }
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
// The following (left) shifts cause the top 5 bits of the mask components to
|
||||||
|
// line up with the corresponding components in an SkPMColor.
|
||||||
|
// Note that the mask's RGB16 order may differ from the SkPMColor order.
|
@ -0,0 +1,16 @@
|
|||||||
|
Index: chromium-128.0.6613.113/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
|
||||||
|
===================================================================
|
||||||
|
--- chromium-128.0.6613.113.orig/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
|
||||||
|
+++ chromium-128.0.6613.113/base/allocator/partition_allocator/src/partition_alloc/page_allocator_constants.h
|
||||||
|
@@ -187,7 +187,11 @@ SystemPageBaseMask() {
|
||||||
|
return ~SystemPageOffsetMask();
|
||||||
|
}
|
||||||
|
|
||||||
|
+#if PA_BUILDFLAG(PA_ARCH_CPU_PPC64_FAMILY)
|
||||||
|
+constexpr size_t kPageMetadataShift = 6; // 64 bytes per partition page.
|
||||||
|
+#else
|
||||||
|
constexpr size_t kPageMetadataShift = 5; // 32 bytes per partition page.
|
||||||
|
+#endif
|
||||||
|
constexpr size_t kPageMetadataSize = 1 << kPageMetadataShift;
|
||||||
|
|
||||||
|
} // namespace internal
|
File diff suppressed because it is too large
Load Diff
Some files were not shown because too many files have changed in this diff Show More
Loading…
Reference in new issue