March 2023 - netsurf-commits - listmaster.pepperfish.net

netsurf: branch master updated. release/3.10-359-g21e636a

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/21e636a3a6056c23bbd42... ...commit http://git.netsurf-browser.org/netsurf.git/commit/21e636a3a6056c23bbd4257... ...tree http://git.netsurf-browser.org/netsurf.git/tree/21e636a3a6056c23bbd4257f5... The branch, master has been updated via 21e636a3a6056c23bbd4257f50315532fe010aa5 (commit) from b56d74b5df9becb324ef2d49bfe079acc505e76b (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=21e636a3a6056c23bbd... commit 21e636a3a6056c23bbd4257f50315532fe010aa5 Author: Michael Drake <tlsa(a)netsurf-browser.org> Commit: Michael Drake <mdrake.unique(a)gmail.com> ci: Add ccache to github workflows diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 13b59c3..eb92cdd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,6 +31,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache check clang flex @@ -46,6 +47,12 @@ jobs: pkg-config wbritish # Needed for `/usr/share/dict/words`, used by test + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.compiler.vendor }} + max-size: 128M + - name: Build and install project libs env: CC: ${{ matrix.compiler.CC }} diff --git a/.github/workflows/monkey-test.yaml b/.github/workflows/monkey-test.yaml index 421bf3b..e95c979 100644 --- a/.github/workflows/monkey-test.yaml +++ b/.github/workflows/monkey-test.yaml @@ -23,6 +23,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache check clang flex @@ -38,6 +39,12 @@ jobs: pkg-config wbritish # Needed for `/usr/share/dict/words`, used by test + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }} + max-size: 128M + - name: Build and install project libs run: | export TARGET_WORKSPACE="$(pwd)/projects" diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 5027d05..8604761 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -23,6 +23,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache flex git gperf @@ -34,6 +35,12 @@ jobs: librsvg2-dev pkg-config + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }} + max-size: 128M + - name: Build and install project libs run: | export TARGET_WORKSPACE="$(pwd)/projects" ----------------------------------------------------------------------- Summary of changes: .github/workflows/build.yaml | 7 +++++++ .github/workflows/monkey-test.yaml | 7 +++++++ .github/workflows/static-analysis.yaml | 7 +++++++ 3 files changed, 21 insertions(+) diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml index 13b59c3..eb92cdd 100644 --- a/.github/workflows/build.yaml +++ b/.github/workflows/build.yaml @@ -31,6 +31,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache check clang flex @@ -46,6 +47,12 @@ jobs: pkg-config wbritish # Needed for `/usr/share/dict/words`, used by test + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }}-${{ matrix.os }}-${{ matrix.compiler.vendor }} + max-size: 128M + - name: Build and install project libs env: CC: ${{ matrix.compiler.CC }} diff --git a/.github/workflows/monkey-test.yaml b/.github/workflows/monkey-test.yaml index 421bf3b..e95c979 100644 --- a/.github/workflows/monkey-test.yaml +++ b/.github/workflows/monkey-test.yaml @@ -23,6 +23,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache check clang flex @@ -38,6 +39,12 @@ jobs: pkg-config wbritish # Needed for `/usr/share/dict/words`, used by test + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }} + max-size: 128M + - name: Build and install project libs run: | export TARGET_WORKSPACE="$(pwd)/projects" diff --git a/.github/workflows/static-analysis.yaml b/.github/workflows/static-analysis.yaml index 5027d05..8604761 100644 --- a/.github/workflows/static-analysis.yaml +++ b/.github/workflows/static-analysis.yaml @@ -23,6 +23,7 @@ jobs: sudo apt-get install --no-install-recommends -y bison build-essential + ccache flex git gperf @@ -34,6 +35,12 @@ jobs: librsvg2-dev pkg-config + - name: ccache + uses: hendrikmuhs/ccache-action(a)v1.2 + with: + key: ${{ github.job }} + max-size: 128M + - name: Build and install project libs run: | export TARGET_WORKSPACE="$(pwd)/projects" -- NetSurf Browser

9 months

1
0
0 / 0

toolchains: branch master updated. 903727aa699111498652e4926f360aa0a6e4921e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/903727aa6991114986... ...commit http://git.netsurf-browser.org/toolchains.git/commit/903727aa699111498652... ...tree http://git.netsurf-browser.org/toolchains.git/tree/903727aa699111498652e4... The branch, master has been updated via 903727aa699111498652e4926f360aa0a6e4921e (commit) from e53bdb13246bc68a03a2312eccc42bf19be8dd3d (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=903727aa69911149... commit 903727aa699111498652e4926f360aa0a6e4921e Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> RISC OS: update makerun to fe55b6bf diff --git a/arm-riscos-gnueabi/Makefile b/arm-riscos-gnueabi/Makefile index 48dca07..11b93c6 100644 --- a/arm-riscos-gnueabi/Makefile +++ b/arm-riscos-gnueabi/Makefile @@ -23,7 +23,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := dc839346 +UPSTREAM_MAKERUN_VERSION := fe55b6bf UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index 7630adf..60b08a7 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -14,7 +14,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := dc839346 +UPSTREAM_MAKERUN_VERSION := fe55b6bf UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git ----------------------------------------------------------------------- Summary of changes: arm-riscos-gnueabi/Makefile | 2 +- arm-unknown-riscos/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm-riscos-gnueabi/Makefile b/arm-riscos-gnueabi/Makefile index 48dca07..11b93c6 100644 --- a/arm-riscos-gnueabi/Makefile +++ b/arm-riscos-gnueabi/Makefile @@ -23,7 +23,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := dc839346 +UPSTREAM_MAKERUN_VERSION := fe55b6bf UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index 7630adf..60b08a7 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -14,7 +14,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := dc839346 +UPSTREAM_MAKERUN_VERSION := fe55b6bf UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

makerun: branch master updated. fe55b6bfda74b0398eaa141faec44df4af8f8f16

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/makerun.git/shortlog/fe55b6bfda74b0398eaa1... ...commit http://git.netsurf-browser.org/makerun.git/commit/fe55b6bfda74b0398eaa141... ...tree http://git.netsurf-browser.org/makerun.git/tree/fe55b6bfda74b0398eaa141fa... The branch, master has been updated via fe55b6bfda74b0398eaa141faec44df4af8f8f16 (commit) from dc839346e8a2032d0fe318b5c098af8e6e0cd76e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/makerun.git/commit/?id=fe55b6bfda74b0398ea... commit fe55b6bfda74b0398eaa141faec44df4af8f8f16 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Fix squeezed relocateable image support diff --git a/makerun.c b/makerun.c index 48b1d1e..435e63a 100644 --- a/makerun.c +++ b/makerun.c @@ -113,9 +113,17 @@ int main(int argc, char **argv) return 1; } + /* Squeeze always processes pairs of words at a time, + * so the declared decompressed size will always be + * rounded up to an 8-byte boundary. We will need to + * adjust expected_size to account for this but, if + * the image is also relocateable, the file size will + * be modified instead as a result of discarding the + * relocation code and tables from the end of the + * image. Therefore, we'll defer the expected_size + * adjustment until later. + */ file_size = sizeof(header) + (size_t) sqzhdr.decsize; - /* Round expected size up to an even number of words */ - expected_size = (expected_size + 7) & ~7; } fclose(f); @@ -144,6 +152,11 @@ int main(int argc, char **argv) file_size -= reloc_size; /* Add relocation workspace on to reloc size */ reloc_size += header.wkspace; + } else if ((header.decompress >> 24) == 0xEB) { + /* Image is compressed, but not relocateable */ + /* Round expected size up to an even number of words + * (see above for details) */ + expected_size = (expected_size + 7) & ~7; } if (file_size != expected_size) { ----------------------------------------------------------------------- Summary of changes: makerun.c | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/makerun.c b/makerun.c index 48b1d1e..435e63a 100644 --- a/makerun.c +++ b/makerun.c @@ -113,9 +113,17 @@ int main(int argc, char **argv) return 1; } + /* Squeeze always processes pairs of words at a time, + * so the declared decompressed size will always be + * rounded up to an 8-byte boundary. We will need to + * adjust expected_size to account for this but, if + * the image is also relocateable, the file size will + * be modified instead as a result of discarding the + * relocation code and tables from the end of the + * image. Therefore, we'll defer the expected_size + * adjustment until later. + */ file_size = sizeof(header) + (size_t) sqzhdr.decsize; - /* Round expected size up to an even number of words */ - expected_size = (expected_size + 7) & ~7; } fclose(f); @@ -144,6 +152,11 @@ int main(int argc, char **argv) file_size -= reloc_size; /* Add relocation workspace on to reloc size */ reloc_size += header.wkspace; + } else if ((header.decompress >> 24) == 0xEB) { + /* Image is compressed, but not relocateable */ + /* Round expected size up to an even number of words + * (see above for details) */ + expected_size = (expected_size + 7) & ~7; } if (file_size != expected_size) { -- WimpSlot calculator for NetSurf

9 months

1
0
0 / 0

toolchains: branch master updated. e53bdb13246bc68a03a2312eccc42bf19be8dd3d

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/e53bdb13246bc68a03... ...commit http://git.netsurf-browser.org/toolchains.git/commit/e53bdb13246bc68a03a2... ...tree http://git.netsurf-browser.org/toolchains.git/tree/e53bdb13246bc68a03a231... The branch, master has been updated via e53bdb13246bc68a03a2312eccc42bf19be8dd3d (commit) from 78871a0b9d36f79e00ddf84f73dadeff3f2687da (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=e53bdb13246bc68a... commit e53bdb13246bc68a03a2312eccc42bf19be8dd3d Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> allow libcurl to build with static cares diff --git a/sdk/Makefile b/sdk/Makefile index ea4fc74..dd1c9dd 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -171,7 +171,7 @@ ifeq ($(TARGET),i686-w64-mingw32) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random - LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" TARGET_OPENSSL := mingw ENV_OPENSSL := WINDRES="$(windres__)" EXTRAARGS_OPENSSL := no-asm enable-capieng @@ -181,7 +181,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random - LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" TARGET_OPENSSL := mingw64 EXTRAARGS_OPENSSL := no-asm enable-capieng endif ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdk/Makefile b/sdk/Makefile index ea4fc74..dd1c9dd 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -171,7 +171,7 @@ ifeq ($(TARGET),i686-w64-mingw32) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random - LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" TARGET_OPENSSL := mingw ENV_OPENSSL := WINDRES="$(windres__)" EXTRAARGS_OPENSSL := no-asm enable-capieng @@ -181,7 +181,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, libiconv.d libgnurx.d $(COMMON_SDK_ITEMS) libjpeg.d libwebp.d) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random - LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32 -liphlpapi" TARGET_OPENSSL := mingw64 EXTRAARGS_OPENSSL := no-asm enable-capieng endif -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

toolchains: branch master updated. 78871a0b9d36f79e00ddf84f73dadeff3f2687da

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/78871a0b9d36f79e00... ...commit http://git.netsurf-browser.org/toolchains.git/commit/78871a0b9d36f79e00dd... ...tree http://git.netsurf-browser.org/toolchains.git/tree/78871a0b9d36f79e00ddf8... The branch, master has been updated via 78871a0b9d36f79e00ddf84f73dadeff3f2687da (commit) from 16a57c03b15a61eac19edb5190cdc6fc4cefd9eb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=78871a0b9d36f79e... commit 78871a0b9d36f79e00ddf84f73dadeff3f2687da Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> Chang parallelism limit to something teh worker can achive diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile index cf45022..5d35249 100644 --- a/i686-w64-mingw32/Makefile +++ b/i686-w64-mingw32/Makefile @@ -61,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index a7e7edc..154be8f 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -61,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 4 + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ ----------------------------------------------------------------------- Summary of changes: i686-w64-mingw32/Makefile | 2 +- x86_64-w64-mingw32/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/i686-w64-mingw32/Makefile b/i686-w64-mingw32/Makefile index cf45022..5d35249 100644 --- a/i686-w64-mingw32/Makefile +++ b/i686-w64-mingw32/Makefile @@ -61,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ diff --git a/x86_64-w64-mingw32/Makefile b/x86_64-w64-mingw32/Makefile index a7e7edc..154be8f 100644 --- a/x86_64-w64-mingw32/Makefile +++ b/x86_64-w64-mingw32/Makefile @@ -61,7 +61,7 @@ $(BUILDSTEPS)/gcc-core.d: $(BUILDSTEPS)/srcdir-step3.d $(BUILDSTEPS)/binutils.d --prefix=$(PREFIX) --target=$(TARGET_NAME) \ --enable-languages=c,c++ --with-system-zlib --disable-multilib \ --enable-shared --enable-fully-dynamic-string - cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 4 + cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make all-gcc -j 8 cd $(BUILDDIR)/gcc && PATH="$(PREFIX)/bin:$(PATH)" make install-gcc touch $@ -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

netsurf: branch master updated. release/3.10-358-gb56d74b

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/b56d74b5df9becb324ef2... ...commit http://git.netsurf-browser.org/netsurf.git/commit/b56d74b5df9becb324ef2d4... ...tree http://git.netsurf-browser.org/netsurf.git/tree/b56d74b5df9becb324ef2d49b... The branch, master has been updated via b56d74b5df9becb324ef2d49bfe079acc505e76b (commit) from 7e6acf326bc52fbd97d5e330799240f977db5ccb (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/netsurf.git/commit/?id=b56d74b5df9becb324e... commit b56d74b5df9becb324ef2d49bfe079acc505e76b Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Retire long-dead code diff --git a/utils/libdom.c b/utils/libdom.c index a996e98..c39aad3 100644 --- a/utils/libdom.c +++ b/utils/libdom.c @@ -28,129 +28,6 @@ #include "utils/log.h" #include "utils/libdom.h" -/* exported interface documented in libdom.h */ -bool libdom_treewalk(dom_node *root, - bool (*callback)(dom_node *node, dom_string *name, void *ctx), - void *ctx) -{ - dom_node *node; - bool result = true; - - node = dom_node_ref(root); /* tree root */ - - while (node != NULL) { - dom_node *next = NULL; - dom_node_type type; - dom_string *name; - dom_exception exc; - - exc = dom_node_get_first_child(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - break; - } - - if (next != NULL) { - /* 1. Got children */ - dom_node_unref(node); - node = next; - } else { - /* No children; siblings & ancestor's siblings */ - while (node != NULL) { - exc = dom_node_get_next_sibling(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - node = NULL; - break; - } - - if (next != NULL) { - /* 2. Got sibling */ - break; - } - - exc = dom_node_get_parent_node(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - node = NULL; - break; - } - - /* 3. Try parent */ - dom_node_unref(node); - node = next; - } - - if (node == NULL) - break; - - dom_node_unref(node); - node = next; - } - - assert(node != NULL); - - exc = dom_node_get_node_type(node, &type); - if ((exc != DOM_NO_ERR) || (type != DOM_ELEMENT_NODE)) - continue; - - exc = dom_node_get_node_name(node, &name); - if (exc != DOM_NO_ERR) - continue; - - result = callback(node, name, ctx); - - dom_string_unref(name); - - if (result == false) { - break; /* callback caused early termination */ - } - - } - return result; -} - - -/* libdom_treewalk context for libdom_find_element */ -struct find_element_ctx { - lwc_string *search; - dom_node *found; -}; - -/* libdom_treewalk callback for libdom_find_element */ -static bool libdom_find_element_callback(dom_node *node, dom_string *name, - void *ctx) -{ - struct find_element_ctx *data = ctx; - - if (dom_string_caseless_lwc_isequal(name, data->search)) { - /* Found element */ - data->found = node; - return false; /* Discontinue search */ - } - - return true; /* Continue search */ -} - - -/* exported interface documented in libdom.h */ -dom_node *libdom_find_element(dom_node *node, lwc_string *element_name) -{ - struct find_element_ctx data; - - assert(element_name != NULL); - - if (node == NULL) - return NULL; - - data.search = element_name; - data.found = NULL; - - libdom_treewalk(node, libdom_find_element_callback, &data); - - return data.found; -} - /* exported interface documented in libdom.h */ dom_node *libdom_find_first_element(dom_node *parent, lwc_string *element_name) diff --git a/utils/libdom.h b/utils/libdom.h index 306aa0f..6384193 100644 --- a/utils/libdom.h +++ b/utils/libdom.h @@ -33,29 +33,6 @@ #include <dom/bindings/hubbub/errors.h> /** - * depth-first walk the dom calling callback for each element - * - * \param root the dom node to use as the root of the tree walk - * \param callback The function called for each element - * \param ctx The context passed to the callback. - * \return true if all nodes were examined, false if the callback terminated - * the walk early. - */ -bool libdom_treewalk(dom_node *root, - bool (*callback)(dom_node *node, dom_string *name, void *ctx), - void *ctx); - -/** - * Search the descendants of a node for an element. - * - * \param node dom_node to search children of, or NULL - * \param element_name name of element to find - * \return first child of node which is an element and matches name, or - * NULL if not found or parameter node is NULL - */ -dom_node *libdom_find_element(dom_node *node, lwc_string *element_name); - -/** * Search children of a node for first named element * \param parent dom_node to search children of, or NULL * \param element_name name of element to find ----------------------------------------------------------------------- Summary of changes: utils/libdom.c | 123 -------------------------------------------------------- utils/libdom.h | 23 ----------- 2 files changed, 146 deletions(-) diff --git a/utils/libdom.c b/utils/libdom.c index a996e98..c39aad3 100644 --- a/utils/libdom.c +++ b/utils/libdom.c @@ -28,129 +28,6 @@ #include "utils/log.h" #include "utils/libdom.h" -/* exported interface documented in libdom.h */ -bool libdom_treewalk(dom_node *root, - bool (*callback)(dom_node *node, dom_string *name, void *ctx), - void *ctx) -{ - dom_node *node; - bool result = true; - - node = dom_node_ref(root); /* tree root */ - - while (node != NULL) { - dom_node *next = NULL; - dom_node_type type; - dom_string *name; - dom_exception exc; - - exc = dom_node_get_first_child(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - break; - } - - if (next != NULL) { - /* 1. Got children */ - dom_node_unref(node); - node = next; - } else { - /* No children; siblings & ancestor's siblings */ - while (node != NULL) { - exc = dom_node_get_next_sibling(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - node = NULL; - break; - } - - if (next != NULL) { - /* 2. Got sibling */ - break; - } - - exc = dom_node_get_parent_node(node, &next); - if (exc != DOM_NO_ERR) { - dom_node_unref(node); - node = NULL; - break; - } - - /* 3. Try parent */ - dom_node_unref(node); - node = next; - } - - if (node == NULL) - break; - - dom_node_unref(node); - node = next; - } - - assert(node != NULL); - - exc = dom_node_get_node_type(node, &type); - if ((exc != DOM_NO_ERR) || (type != DOM_ELEMENT_NODE)) - continue; - - exc = dom_node_get_node_name(node, &name); - if (exc != DOM_NO_ERR) - continue; - - result = callback(node, name, ctx); - - dom_string_unref(name); - - if (result == false) { - break; /* callback caused early termination */ - } - - } - return result; -} - - -/* libdom_treewalk context for libdom_find_element */ -struct find_element_ctx { - lwc_string *search; - dom_node *found; -}; - -/* libdom_treewalk callback for libdom_find_element */ -static bool libdom_find_element_callback(dom_node *node, dom_string *name, - void *ctx) -{ - struct find_element_ctx *data = ctx; - - if (dom_string_caseless_lwc_isequal(name, data->search)) { - /* Found element */ - data->found = node; - return false; /* Discontinue search */ - } - - return true; /* Continue search */ -} - - -/* exported interface documented in libdom.h */ -dom_node *libdom_find_element(dom_node *node, lwc_string *element_name) -{ - struct find_element_ctx data; - - assert(element_name != NULL); - - if (node == NULL) - return NULL; - - data.search = element_name; - data.found = NULL; - - libdom_treewalk(node, libdom_find_element_callback, &data); - - return data.found; -} - /* exported interface documented in libdom.h */ dom_node *libdom_find_first_element(dom_node *parent, lwc_string *element_name) diff --git a/utils/libdom.h b/utils/libdom.h index 306aa0f..6384193 100644 --- a/utils/libdom.h +++ b/utils/libdom.h @@ -33,29 +33,6 @@ #include <dom/bindings/hubbub/errors.h> /** - * depth-first walk the dom calling callback for each element - * - * \param root the dom node to use as the root of the tree walk - * \param callback The function called for each element - * \param ctx The context passed to the callback. - * \return true if all nodes were examined, false if the callback terminated - * the walk early. - */ -bool libdom_treewalk(dom_node *root, - bool (*callback)(dom_node *node, dom_string *name, void *ctx), - void *ctx); - -/** - * Search the descendants of a node for an element. - * - * \param node dom_node to search children of, or NULL - * \param element_name name of element to find - * \return first child of node which is an element and matches name, or - * NULL if not found or parameter node is NULL - */ -dom_node *libdom_find_element(dom_node *node, lwc_string *element_name); - -/** * Search children of a node for first named element * \param parent dom_node to search children of, or NULL * \param element_name name of element to find -- NetSurf Browser

9 months

1
0
0 / 0

toolchains: branch master updated. 16a57c03b15a61eac19edb5190cdc6fc4cefd9eb

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/16a57c03b15a61eac1... ...commit http://git.netsurf-browser.org/toolchains.git/commit/16a57c03b15a61eac19e... ...tree http://git.netsurf-browser.org/toolchains.git/tree/16a57c03b15a61eac19edb... The branch, master has been updated via 16a57c03b15a61eac19edb5190cdc6fc4cefd9eb (commit) from 0f33d10748a2bed956af8c8a23f23b39461ae7c3 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=16a57c03b15a61ea... commit 16a57c03b15a61eac19edb5190cdc6fc4cefd9eb Author: Vincent Sanders <vince(a)kyllikki.org> Commit: Vincent Sanders <vince(a)kyllikki.org> change openssl 3 targets when compiling with mingw diff --git a/sdk/Makefile b/sdk/Makefile index 634019be..ea4fc74 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -68,6 +68,7 @@ cc__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)) cxx__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)) ar__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)) ranlib__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ranlib)) +windres__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)) # Flags cflags__ := -I$(GCCSDK_INSTALL_ENV)/include @@ -125,6 +126,9 @@ FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag # per target environments LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo +# Openssl target has to alter for mingw +TARGET_OPENSSL:=$(TARGET) + # Target Specific setup ifeq ($(TARGET),arm-riscos-gnueabi) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d libwebp.d) @@ -168,6 +172,8 @@ ifeq ($(TARGET),i686-w64-mingw32) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + TARGET_OPENSSL := mingw + ENV_OPENSSL := WINDRES="$(windres__)" EXTRAARGS_OPENSSL := no-asm enable-capieng endif @@ -176,6 +182,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + TARGET_OPENSSL := mingw64 EXTRAARGS_OPENSSL := no-asm enable-capieng endif @@ -189,7 +196,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos) LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" # XXX: build openssl against bsdsocket.library? - #OPENSSL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" + #ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" ifeq ($(LIBCURL_SSL),openssl) LIBCURL_ENV := LIBS="-lm -lnet" else @@ -421,7 +428,7 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz: # OpenSSL $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d ifeq ($(LIBCURL_SSL),openssl) - cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) $(OPENSSL_ENV) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL) + cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) $(ENV_OPENSSL) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET_OPENSSL) no-shared no-threads $(EXTRAARGS_OPENSSL) cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install endif touch $@ ----------------------------------------------------------------------- Summary of changes: sdk/Makefile | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/sdk/Makefile b/sdk/Makefile index 634019be..ea4fc74 100644 --- a/sdk/Makefile +++ b/sdk/Makefile @@ -68,6 +68,7 @@ cc__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*gcc)) cxx__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*g++)) ar__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ar)) ranlib__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*ranlib)) +windres__ := $(word 1,$(wildcard $(GCCSDK_INSTALL_CROSSBIN)/*windres)) # Flags cflags__ := -I$(GCCSDK_INSTALL_ENV)/include @@ -125,6 +126,9 @@ FREETYPE_ENV := LIBPNG_CFLAGS=$$($(GCCSDK_INSTALL_ENV)/bin/libpng-config --cflag # per target environments LIBJPEG_TURBO_BUILDDIR:=$(BUILDDIR)/libjpegturbo +# Openssl target has to alter for mingw +TARGET_OPENSSL:=$(TARGET) + # Target Specific setup ifeq ($(TARGET),arm-riscos-gnueabi) SDK_ITEMS := $(addprefix $(BUILDSTEPS)/, $(COMMON_SDK_ITEMS) libjpeg-turbo.d libwebp.d) @@ -168,6 +172,8 @@ ifeq ($(TARGET),i686-w64-mingw32) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + TARGET_OPENSSL := mingw + ENV_OPENSSL := WINDRES="$(windres__)" EXTRAARGS_OPENSSL := no-asm enable-capieng endif @@ -176,6 +182,7 @@ ifeq ($(TARGET),x86_64-w64-mingw32) EXTRAARGS_LIBCARES := --disable-shared EXTRAARGS_LIBCURL := --enable-nonblocking --enable-ares --disable-ldap --without-random LIBCURL_ENV := CFLAGS="-DCARES_STATICLIB" LIBS="-lgdi32 -lcrypt32" + TARGET_OPENSSL := mingw64 EXTRAARGS_OPENSSL := no-asm enable-capieng endif @@ -189,7 +196,7 @@ ifeq ($(TARGET),m68k-unknown-amigaos) LIBJPEG_ENV := LDFLAGS="-lm" LIBJPEG_TURBO_ENV := LDFLAGS="-lm" # XXX: build openssl against bsdsocket.library? - #OPENSSL_ENV := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" + #ENV_OPENSSL := CFLAGS="-I$(GCCSDK_INSTALL_ENV)/netinclude" CPPFLAGS="-D__NO_NET_API" ifeq ($(LIBCURL_SSL),openssl) LIBCURL_ENV := LIBS="-lm -lnet" else @@ -421,7 +428,7 @@ $(SOURCEDIR)/pbl_$(VERSION_LIBPBL).tar.gz: # OpenSSL $(BUILDSTEPS)/openssl.d: $(BUILDSTEPS)/builddir.d $(BUILDSTEPS)/zlib.d $(BUILDSTEPS)/openssl-src.d ifeq ($(LIBCURL_SSL),openssl) - cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) $(OPENSSL_ENV) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET) no-shared no-threads $(EXTRAARGS_OPENSSL) + cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) $(ENV_OPENSSL) ./Configure --prefix=$(GCCSDK_INSTALL_ENV) $(TARGET_OPENSSL) no-shared no-threads $(EXTRAARGS_OPENSSL) cd $(BUILDDIR)/openssl/openssl-$(VERSION_OPENSSL) && $(env) make install endif touch $@ -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

toolchains: branch master updated. 0f33d10748a2bed956af8c8a23f23b39461ae7c3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/0f33d10748a2bed956... ...commit http://git.netsurf-browser.org/toolchains.git/commit/0f33d10748a2bed956af... ...tree http://git.netsurf-browser.org/toolchains.git/tree/0f33d10748a2bed956af8c... The branch, master has been updated via 0f33d10748a2bed956af8c8a23f23b39461ae7c3 (commit) from 0dd23cba924bd6f38541162996b08be1d880ebcc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=0f33d10748a2bed9... commit 0f33d10748a2bed956af8c8a23f23b39461ae7c3 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> RISC OS: update makerun to dc839346 diff --git a/arm-riscos-gnueabi/Makefile b/arm-riscos-gnueabi/Makefile index b620d82..48dca07 100644 --- a/arm-riscos-gnueabi/Makefile +++ b/arm-riscos-gnueabi/Makefile @@ -23,7 +23,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := a6a833a5 +UPSTREAM_MAKERUN_VERSION := dc839346 UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index b80f81e..7630adf 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -14,7 +14,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := a6a833a5 +UPSTREAM_MAKERUN_VERSION := dc839346 UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git ----------------------------------------------------------------------- Summary of changes: arm-riscos-gnueabi/Makefile | 2 +- arm-unknown-riscos/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arm-riscos-gnueabi/Makefile b/arm-riscos-gnueabi/Makefile index b620d82..48dca07 100644 --- a/arm-riscos-gnueabi/Makefile +++ b/arm-riscos-gnueabi/Makefile @@ -23,7 +23,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := a6a833a5 +UPSTREAM_MAKERUN_VERSION := dc839346 UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git diff --git a/arm-unknown-riscos/Makefile b/arm-unknown-riscos/Makefile index b80f81e..7630adf 100644 --- a/arm-unknown-riscos/Makefile +++ b/arm-unknown-riscos/Makefile @@ -14,7 +14,7 @@ UPSTREAM_CCRES_TARBALL := ccres$(UPSTREAM_CCRES_VERSION).tar.gz UPSTREAM_CCRES_URI := svn://svn.riscos.info/ccres/trunk@$(UPSTREAM_CCRES_VERSION) # Makerun -UPSTREAM_MAKERUN_VERSION := a6a833a5 +UPSTREAM_MAKERUN_VERSION := dc839346 UPSTREAM_MAKERUN_TARBALL := makerun$(UPSTREAM_MAKERUN_VERSION).tar.gz UPSTREAM_MAKERUN_URI := git://git.netsurf-browser.org/makerun.git -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

makerun: branch master updated. dc839346e8a2032d0fe318b5c098af8e6e0cd76e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/makerun.git/shortlog/dc839346e8a2032d0fe31... ...commit http://git.netsurf-browser.org/makerun.git/commit/dc839346e8a2032d0fe318b... ...tree http://git.netsurf-browser.org/makerun.git/tree/dc839346e8a2032d0fe318b5c... The branch, master has been updated via dc839346e8a2032d0fe318b5c098af8e6e0cd76e (commit) from a6a833a50b3287e6c719d9d5d54f909a894ebaa1 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/makerun.git/commit/?id=dc839346e8a2032d0fe... commit dc839346e8a2032d0fe318b5c098af8e6e0cd76e Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Fix squeezed binary support It turns out that the squeeze algorithm will always round the uncompressed input data up to a multiple of 8 bytes before compressing it. Update our expected size logic to reflect this. diff --git a/makerun.c b/makerun.c index 5008b1b..48b1d1e 100644 --- a/makerun.c +++ b/makerun.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) FILE *f, *g; struct header header; long flen; - size_t file_size, reloc_size = 0; + size_t file_size, reloc_size = 0, expected_size = 0; char buf[256]; if (argc != 4) { @@ -70,6 +70,7 @@ int main(int argc, char **argv) fclose(f); return 1; } + expected_size = header.rosize + header.rwsize + header.dbsize; if ((header.decompress >> 24) == 0xEB) { /* Image is compressed */ @@ -113,6 +114,8 @@ int main(int argc, char **argv) } file_size = sizeof(header) + (size_t) sqzhdr.decsize; + /* Round expected size up to an even number of words */ + expected_size = (expected_size + 7) & ~7; } fclose(f); @@ -143,8 +146,7 @@ int main(int argc, char **argv) reloc_size += header.wkspace; } - if (header.rosize + header.rwsize + header.dbsize != - file_size) { + if (file_size != expected_size) { fprintf(stderr, "Mismatched field sizes\n"); return 1; } ----------------------------------------------------------------------- Summary of changes: makerun.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/makerun.c b/makerun.c index 5008b1b..48b1d1e 100644 --- a/makerun.c +++ b/makerun.c @@ -41,7 +41,7 @@ int main(int argc, char **argv) FILE *f, *g; struct header header; long flen; - size_t file_size, reloc_size = 0; + size_t file_size, reloc_size = 0, expected_size = 0; char buf[256]; if (argc != 4) { @@ -70,6 +70,7 @@ int main(int argc, char **argv) fclose(f); return 1; } + expected_size = header.rosize + header.rwsize + header.dbsize; if ((header.decompress >> 24) == 0xEB) { /* Image is compressed */ @@ -113,6 +114,8 @@ int main(int argc, char **argv) } file_size = sizeof(header) + (size_t) sqzhdr.decsize; + /* Round expected size up to an even number of words */ + expected_size = (expected_size + 7) & ~7; } fclose(f); @@ -143,8 +146,7 @@ int main(int argc, char **argv) reloc_size += header.wkspace; } - if (header.rosize + header.rwsize + header.dbsize != - file_size) { + if (file_size != expected_size) { fprintf(stderr, "Mismatched field sizes\n"); return 1; } -- WimpSlot calculator for NetSurf

9 months

1
0
0 / 0

toolchains: branch master updated. 0dd23cba924bd6f38541162996b08be1d880ebcc

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/0dd23cba924bd6f385... ...commit http://git.netsurf-browser.org/toolchains.git/commit/0dd23cba924bd6f38541... ...tree http://git.netsurf-browser.org/toolchains.git/tree/0dd23cba924bd6f3854116... The branch, master has been updated via 0dd23cba924bd6f38541162996b08be1d880ebcc (commit) from 5e7a082a1d07338dbdaaf07a307918cdc8b01162 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=0dd23cba924bd6f3... commit 0dd23cba924bd6f38541162996b08be1d880ebcc Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> arm-riscos-gnueabi: make DDT hack less invasive Lose 2 instructions (or 25%) from the entrycode by injecting PC-relative instructions to compute the address of the GOT pointer and store it into the "well known" GOTT_BASE at &8038. This does make the relocation code somewhat larger, but there is no space limitation there, so it's less likely to break. (The requirement for at least 3 ELF program headers still remains as, even with this reduction in entrycode size, it's still 16 bytes larger than the space that would be available with 2 program headers). diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p index 9cb8e3f..afac755 100644 --- a/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p @@ -211,7 +211,7 @@ Index: elf2aif/src/elf2aif.c e2a_copy (FILE * elfhandle, FILE * aifhandle) { const phdr_list_t *phdrP; -@@ -488,21 +584,135 @@ +@@ -488,21 +584,156 @@ } memcpy (&aifhdr, aifcode, sizeof (aifcode)); @@ -258,11 +258,9 @@ Index: elf2aif/src/elf2aif.c + { + assert (128 == sizeof (aifcode)); + uint32_t entrycode[] = { -+ /* Copy GOTT_BASE, if it's in the wrong place (see below) */ -+ 0xE24FC088, /* ADR R12, &8000 */ -+ 0xE59C003C, /* LDR R0, [R12, #&3c] */ -+ 0xE3300000, /* TEQ R0, #0 */ -+ 0x158C0038, /* STRNE R0, [R12, #&38] */ ++ /* Space for GOTT_BASE injection (see below) */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ 0xE1A00000, /* MOV R0, R0 */ + /* Install the abort handler */ + 0xE3A00002, /* MOV R0, #2 */ + 0xEF059D01, /* SWI ARMEABISupport_AbortOp */ @@ -279,31 +277,54 @@ Index: elf2aif/src/elf2aif.c + 0xE04EC00F, /* SUB R12, LR, PC */ + 0xE08FC00C, /* ADD R12, PC, R12 */ + 0xE24CC00C, /* SUB R12, R12, #12 */ -+ /* Prevent reentry by replacing the branch to the relocation code */ ++ /* Prevent reentry by replacing the branch to the relocation code. */ + 0xE51F0018, /* LDR R0, =RelocCode */ + 0xE58C0004, /* STR R0, [R12, #4] */ + /* Relocate the GOT offset (above) to its absolute address */ -+ 0xE59C009C, /* LDR R0, [R12, #&9c] */ ++ 0xE59C0094, /* LDR R0, [R12, #&94] */ + 0xE3300000, /* TEQ R0, #0 */ + 0x1080000C, /* ADDNE R0, R0, R12 */ -+ 0xE58C009C, /* STR R0, [R12, #&9c] */ -+ /* Fill in GOTT_BASE at load + 0x38. -+ * Unfortunately, this interacts badly with DDT, which uses -+ * the reserved field at &8038 to temporarily store the address -+ * of the zero-initialisation code during program start (it -+ * subsequently puts it back after its replacement is called). -+ * Make this less surprising by placing GOTT_BASE in the other -+ * reserved field at &803c and then rely on the entrycode -+ * (see above) fixing things up. Do it properly in the non-DDT -+ * case, however, so that the OS can mark the entire RO area -+ * non-writeable once the relocation code has completed. -+ */ ++ 0x158C0094, /* STRNE R0, [R12, #&94] */ ++ /* Fill in GOTT_BASE at load + 0x38, unless running under DDT */ + 0xE59C0038, /* LDR R0, [R12, #&38] */ + 0xE3300000, /* TEQ R0, #0 */ -+ 0xE28C009C, /* ADD R0, R12, #&9c */ -+ 0x058C0038, /* STREQ R0, [R12, #&38] */ -+ 0x158C003C, /* STRNE R0, [R12, #&3c] */ ++ 0x1A000002, /* BNE ddt_hack */ ++ 0xE28C0094, /* ADD R0, R12, #&94 */ ++ 0xE58C0038, /* STR R0, [R12, #&38] */ ++ 0xE1A0F00E, /* MOV PC, LR */ ++ /* Hack for DDT (which uses the reserved field at &8038 to ++ * temporarily store the address of the zero-initialisation code ++ * during program start, which is reinstated after DDT's ++ * replacement is called). In this case, modify the entrycode ++ * (above) to inject it for us. ++ * ++ * This does prevent the RO area being marked non-writeable if ++ * the modified entrycode gets executed, however (in the non-DDT ++ * case, the entrycode does not write to the AIF header, so ++ * there is no reason the RO area can't be non-writeable then). ++ * By definition the RO area must be writeable for relocations to ++ * work, so it is perfectly safe to assume that it is when this ++ * code runs. ++ */ ++ /* ddt_hack: */ ++ 0xE59F001C, /* LDR R0, =ddt_hack_data */ ++ 0xE59F101C, /* LDR R1, =ddt_hack_data+4 */ ++ 0xE58C0080, /* STR R0, [R12, #&80] */ ++ 0xE58C1084, /* STR R1, [R12, #&84] */ ++ /* Invalidate instruction cache */ ++ 0xE3A00001, /* MOV R0, #1 */ ++ 0xE28C1080, /* ADD R1, R12, #&80 */ ++ 0xE28C2088, /* ADD R2, R12, #&88 */ ++ 0xEF02006E, /* SWI XOSSynchroniseCodeAreas */ + 0xE1A0F00E, /* MOV PC, LR */ ++ /* Instructions to inject into entrycode. Uses PC-relative ++ * addressing, so must be kept in sync with changes to entrycode ++ * or the location of entrycode within memory. */ ++ /* ddt_hack_data: */ ++ /* Compute address of GOT field after entrycode */ ++ 0xE28F000C, /* ADR R0, got_address */ ++ /* Store computed address in GOTT_BASE (load + 0x38) */ ++ 0xE50F0054, /* STR R0, [pc, #-&54] */ + /* Relocation sentinel: just in case anything expects one */ + 0xFFFFFFFF, /* DCD -1 */ + }; @@ -319,12 +340,12 @@ Index: elf2aif/src/elf2aif.c + if (opt_verbose) + printf ("Writing EABI entry code at offset 0x%x\n", sizeof (aifcode)); + -+ entrycode[6] |= (exec_addr - load_addr - (sizeof (aifcode) + 6*4 + 8)) >> 2; ++ entrycode[4] |= (exec_addr - load_addr - (sizeof (aifcode) + 4*4 + 8)) >> 2; + if (got_addr) + { + if (opt_verbose) + printf ("Found GOT at 0x%x\n", got_addr); -+ entrycode[7] = (got_addr - load_addr); ++ entrycode[5] = (got_addr - load_addr); + } + if (fseek (aifhandle, sizeof (aifcode), SEEK_SET) != 0 + || fwrite (&entrycode, sizeof (entrycode), 1, aifhandle) != 1) @@ -353,7 +374,7 @@ Index: elf2aif/src/elf2aif.c return EXIT_SUCCESS; } -@@ -557,6 +767,7 @@ +@@ -557,6 +788,7 @@ elf_filename = elffilename; if (e2a_readehdr (elfhandle) == EXIT_SUCCESS @@ -361,7 +382,7 @@ Index: elf2aif/src/elf2aif.c && e2a_readphdr (elfhandle) == EXIT_SUCCESS && e2a_copy (elfhandle, aifhandle) == EXIT_SUCCESS) status = EXIT_SUCCESS; -@@ -683,6 +894,9 @@ +@@ -683,6 +915,9 @@ fprintf (stderr, "Warning: extra options/arguments ignored\n"); return EXIT_SUCCESS; } ----------------------------------------------------------------------- Summary of changes: .../recipes/patches/gccsdk/elf2aif-eabi-support.p | 75 +++++++++++++------- 1 file changed, 48 insertions(+), 27 deletions(-) diff --git a/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p index 9cb8e3f..afac755 100644 --- a/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p +++ b/arm-riscos-gnueabi/recipes/patches/gccsdk/elf2aif-eabi-support.p @@ -211,7 +211,7 @@ Index: elf2aif/src/elf2aif.c e2a_copy (FILE * elfhandle, FILE * aifhandle) { const phdr_list_t *phdrP; -@@ -488,21 +584,135 @@ +@@ -488,21 +584,156 @@ } memcpy (&aifhdr, aifcode, sizeof (aifcode)); @@ -258,11 +258,9 @@ Index: elf2aif/src/elf2aif.c + { + assert (128 == sizeof (aifcode)); + uint32_t entrycode[] = { -+ /* Copy GOTT_BASE, if it's in the wrong place (see below) */ -+ 0xE24FC088, /* ADR R12, &8000 */ -+ 0xE59C003C, /* LDR R0, [R12, #&3c] */ -+ 0xE3300000, /* TEQ R0, #0 */ -+ 0x158C0038, /* STRNE R0, [R12, #&38] */ ++ /* Space for GOTT_BASE injection (see below) */ ++ 0xE1A00000, /* MOV R0, R0 */ ++ 0xE1A00000, /* MOV R0, R0 */ + /* Install the abort handler */ + 0xE3A00002, /* MOV R0, #2 */ + 0xEF059D01, /* SWI ARMEABISupport_AbortOp */ @@ -279,31 +277,54 @@ Index: elf2aif/src/elf2aif.c + 0xE04EC00F, /* SUB R12, LR, PC */ + 0xE08FC00C, /* ADD R12, PC, R12 */ + 0xE24CC00C, /* SUB R12, R12, #12 */ -+ /* Prevent reentry by replacing the branch to the relocation code */ ++ /* Prevent reentry by replacing the branch to the relocation code. */ + 0xE51F0018, /* LDR R0, =RelocCode */ + 0xE58C0004, /* STR R0, [R12, #4] */ + /* Relocate the GOT offset (above) to its absolute address */ -+ 0xE59C009C, /* LDR R0, [R12, #&9c] */ ++ 0xE59C0094, /* LDR R0, [R12, #&94] */ + 0xE3300000, /* TEQ R0, #0 */ + 0x1080000C, /* ADDNE R0, R0, R12 */ -+ 0xE58C009C, /* STR R0, [R12, #&9c] */ -+ /* Fill in GOTT_BASE at load + 0x38. -+ * Unfortunately, this interacts badly with DDT, which uses -+ * the reserved field at &8038 to temporarily store the address -+ * of the zero-initialisation code during program start (it -+ * subsequently puts it back after its replacement is called). -+ * Make this less surprising by placing GOTT_BASE in the other -+ * reserved field at &803c and then rely on the entrycode -+ * (see above) fixing things up. Do it properly in the non-DDT -+ * case, however, so that the OS can mark the entire RO area -+ * non-writeable once the relocation code has completed. -+ */ ++ 0x158C0094, /* STRNE R0, [R12, #&94] */ ++ /* Fill in GOTT_BASE at load + 0x38, unless running under DDT */ + 0xE59C0038, /* LDR R0, [R12, #&38] */ + 0xE3300000, /* TEQ R0, #0 */ -+ 0xE28C009C, /* ADD R0, R12, #&9c */ -+ 0x058C0038, /* STREQ R0, [R12, #&38] */ -+ 0x158C003C, /* STRNE R0, [R12, #&3c] */ ++ 0x1A000002, /* BNE ddt_hack */ ++ 0xE28C0094, /* ADD R0, R12, #&94 */ ++ 0xE58C0038, /* STR R0, [R12, #&38] */ ++ 0xE1A0F00E, /* MOV PC, LR */ ++ /* Hack for DDT (which uses the reserved field at &8038 to ++ * temporarily store the address of the zero-initialisation code ++ * during program start, which is reinstated after DDT's ++ * replacement is called). In this case, modify the entrycode ++ * (above) to inject it for us. ++ * ++ * This does prevent the RO area being marked non-writeable if ++ * the modified entrycode gets executed, however (in the non-DDT ++ * case, the entrycode does not write to the AIF header, so ++ * there is no reason the RO area can't be non-writeable then). ++ * By definition the RO area must be writeable for relocations to ++ * work, so it is perfectly safe to assume that it is when this ++ * code runs. ++ */ ++ /* ddt_hack: */ ++ 0xE59F001C, /* LDR R0, =ddt_hack_data */ ++ 0xE59F101C, /* LDR R1, =ddt_hack_data+4 */ ++ 0xE58C0080, /* STR R0, [R12, #&80] */ ++ 0xE58C1084, /* STR R1, [R12, #&84] */ ++ /* Invalidate instruction cache */ ++ 0xE3A00001, /* MOV R0, #1 */ ++ 0xE28C1080, /* ADD R1, R12, #&80 */ ++ 0xE28C2088, /* ADD R2, R12, #&88 */ ++ 0xEF02006E, /* SWI XOSSynchroniseCodeAreas */ + 0xE1A0F00E, /* MOV PC, LR */ ++ /* Instructions to inject into entrycode. Uses PC-relative ++ * addressing, so must be kept in sync with changes to entrycode ++ * or the location of entrycode within memory. */ ++ /* ddt_hack_data: */ ++ /* Compute address of GOT field after entrycode */ ++ 0xE28F000C, /* ADR R0, got_address */ ++ /* Store computed address in GOTT_BASE (load + 0x38) */ ++ 0xE50F0054, /* STR R0, [pc, #-&54] */ + /* Relocation sentinel: just in case anything expects one */ + 0xFFFFFFFF, /* DCD -1 */ + }; @@ -319,12 +340,12 @@ Index: elf2aif/src/elf2aif.c + if (opt_verbose) + printf ("Writing EABI entry code at offset 0x%x\n", sizeof (aifcode)); + -+ entrycode[6] |= (exec_addr - load_addr - (sizeof (aifcode) + 6*4 + 8)) >> 2; ++ entrycode[4] |= (exec_addr - load_addr - (sizeof (aifcode) + 4*4 + 8)) >> 2; + if (got_addr) + { + if (opt_verbose) + printf ("Found GOT at 0x%x\n", got_addr); -+ entrycode[7] = (got_addr - load_addr); ++ entrycode[5] = (got_addr - load_addr); + } + if (fseek (aifhandle, sizeof (aifcode), SEEK_SET) != 0 + || fwrite (&entrycode, sizeof (entrycode), 1, aifhandle) != 1) @@ -353,7 +374,7 @@ Index: elf2aif/src/elf2aif.c return EXIT_SUCCESS; } -@@ -557,6 +767,7 @@ +@@ -557,6 +788,7 @@ elf_filename = elffilename; if (e2a_readehdr (elfhandle) == EXIT_SUCCESS @@ -361,7 +382,7 @@ Index: elf2aif/src/elf2aif.c && e2a_readphdr (elfhandle) == EXIT_SUCCESS && e2a_copy (elfhandle, aifhandle) == EXIT_SUCCESS) status = EXIT_SUCCESS; -@@ -683,6 +894,9 @@ +@@ -683,6 +915,9 @@ fprintf (stderr, "Warning: extra options/arguments ignored\n"); return EXIT_SUCCESS; } -- Cross-compilation toolchains and environments

9 months

1
0
0 / 0

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits March 2023