netsurf-commits January 2018

netsurf-commits@netsurf-browser.org

1 participants
68 discussions

libdom: branch dsilvers/forms1 updated. release/0.3.2-8-g68a89f3

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/68a89f33cc8d2d9e6b2fd8... ...commit http://git.netsurf-browser.org/libdom.git/commit/68a89f33cc8d2d9e6b2fd827... ...tree http://git.netsurf-browser.org/libdom.git/tree/68a89f33cc8d2d9e6b2fd82739... The branch, dsilvers/forms1 has been updated via 68a89f33cc8d2d9e6b2fd82739b713b4ed323a9d (commit) from f192fc62a9a59fa26f5be15a07e36a9c80d3121f (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/libdom.git/commit/?id=68a89f33cc8d2d9e6b2f... commit 68a89f33cc8d2d9e6b2fd82739b713b4ed323a9d Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> blech; initial radio nodelist stuff, nowhere near done diff --git a/include/dom/html/html_radio_nodelist.h b/include/dom/html/html_radio_nodelist.h index 502df38..fd4c710 100644 --- a/include/dom/html/html_radio_nodelist.h +++ b/include/dom/html/html_radio_nodelist.h @@ -5,29 +5,29 @@ * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> */ -#ifndef dom_html_radionodelist_h_ -#define dom_html_radionodelist_h_ +#ifndef dom_html_radio_nodelist_h_ +#define dom_html_radio_nodelist_h_ #include <dom/core/exceptions.h> #include <dom/core/string.h> struct dom_node; -typedef struct dom_html_radionodelist dom_html_radionodelist; +typedef struct dom_html_radio_nodelist dom_html_radio_nodelist; -dom_exception dom_html_radionodelist_get_length(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_get_length(dom_html_radio_nodelist *col, uint32_t *len); -dom_exception dom_html_radionodelist_item(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_item(dom_html_radio_nodelist *col, uint32_t index, struct dom_node **node); -dom_exception dom_html_radionodelist_get_value(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_get_value(dom_html_radio_nodelist *col, dom_string **value); -dom_exception dom_html_radionodelist_set_value(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_set_value(dom_html_radio_nodelist *col, dom_string **value); -void dom_html_radionodelist_ref(dom_html_radionodelist *col); -void dom_html_radionodelist_unref(dom_html_radionodelist *col); +void dom_html_radio_nodelist_ref(dom_html_radio_nodelist *col); +void dom_html_radio_nodelist_unref(dom_html_radio_nodelist *col); #endif diff --git a/src/html/Makefile b/src/html/Makefile index cf864bb..55a2d15 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -19,6 +19,7 @@ DIR_SOURCES := \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ html_table_element.c html_tablerow_element.c html_frameset_element.c \ html_frame_element.c html_iframe_element.c html_isindex_element.c \ + html_radio_nodelist.c \ UNINMPLEMENTED_SOURCES := \ diff --git a/src/html/html_form_controls_collection.c b/src/html/html_form_controls_collection.c index 34a3bb4..241a44d 100644 --- a/src/html/html_form_controls_collection.c +++ b/src/html/html_form_controls_collection.c @@ -23,14 +23,12 @@ #include "core/element.h" #include "core/string.h" -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); - /*-----------------------------------------------------------------------*/ /* Internal functions */ /* Callback function to test whether certain node is a form control, see * src/html/html_collection.h for detail. */ -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) +bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) { struct dom_html_document *doc = (struct dom_html_document *)(node->owner); diff --git a/src/html/html_form_controls_collection.h b/src/html/html_form_controls_collection.h index 36cdce0..2604c38 100644 --- a/src/html/html_form_controls_collection.h +++ b/src/html/html_form_controls_collection.h @@ -14,6 +14,9 @@ struct dom_html_form_element; +/* Exposed so that the radio nodelist can use it as a sub-criterion */ +bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); + dom_exception _dom_html_form_controls_collection_create(struct dom_html_form_element *form, dom_html_form_controls_collection **col); diff --git a/src/html/html_radio_nodelist.c b/src/html/html_radio_nodelist.c new file mode 100644 index 0000000..231900e --- /dev/null +++ b/src/html/html_radio_nodelist.c @@ -0,0 +1,199 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#include <assert.h> +#include <stdlib.h> + +#include <libwapcaplet/libwapcaplet.h> + +#include <dom/html/html_radio_nodelist.h> + +#include "html/html_radio_nodelist.h" +#include "html/html_form_controls_collection.h" +#include "html/html_document.h" +#include "html/html_form_element.h" + +#include "core/node.h" +#include "core/element.h" +#include "core/string.h" + +/*-----------------------------------------------------------------------*/ +/* Internal functions */ + +/* Callback function to test whether certain node is a form control, see + * src/html/html_collection.h for detail. */ +static bool _dom_is_specific_form_control(struct dom_node_internal *node, void *ctx) +{ + struct dom_html_document *doc = + (struct dom_html_document *)(node->owner); + struct dom_html_radio_nodelist *nodelist = ctx; + dom_string *str; + dom_exception exc; + + if (_dom_is_form_control(node, nodelist->form)) { + /* It's the control we care about if id or name are equal + * to nodelist->name. We wouldn't be here if node wasn't + * an element node. + */ + exc = _dom_element_get_id((struct dom_element *)node, &str); + + if (exc != DOM_NO_ERR) { + return false; + } + + if (str != NULL && dom_string_isequal(str, nodelist->name)) { + dom_string_unref(str); + return true; + } + + if (str != NULL) + dom_string_unref(str); + + exc = _dom_element_get_attribute((struct dom_element *)node, + doc->memoised[hds_name], &str); + + if (str != NULL && dom_string_isequal(str, nodelist->name)) { + dom_string_unref(str); + return true; + } + + if (str != NULL) + dom_string_unref(str); + } + + return false; +} + +/** + * Create a dom_html_radio_nodelist + * + * \param form The HTML form element for the radio nodelist + * \param name The element id/name for the radio nodelist + * \param nodelist The result radio nodelist object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_radio_nodelist_create(struct dom_html_form_element *form, + dom_string *name, + struct dom_html_radio_nodelist **nodelist) +{ + dom_exception exc; + *nodelist = malloc(sizeof(struct dom_html_radio_nodelist)); + + if (*nodelist == NULL) + return DOM_NO_MEM_ERR; + + exc = _dom_html_radio_nodelist_initialise(form, *nodelist, name); + + if (exc != DOM_NO_ERR) { + /* This is safe because we only ever get an error before we + * ref anything which would need finalising + */ + free(*nodelist); + *nodelist = NULL; + } + + return exc; +} + +/** + * Initialise a dom_html_radio_nodelist + * + * \param form The HTML form element for the radio nodelist + * \param nodelist The radio nodelist object to initialise + * \param name The element id/name for the radio nodelist + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_radio_nodelist_initialise(struct dom_html_form_element *form, + struct dom_html_radio_nodelist *nodelist, + dom_string *name) +{ + dom_exception exc; + dom_html_document *doc = (dom_html_document *) dom_node_get_owner(form); + + assert(form != NULL); + assert(name != NULL); + + assert(doc != NULL); + + exc = _dom_html_collection_create(doc, + (dom_node_internal *) doc, + _dom_is_specific_form_control, + nodelist, &nodelist->col); + + if (exc != DOM_NO_ERR) + return exc; + + nodelist->form = form; + dom_node_ref(form); + + nodelist->name = name; + dom_string_ref(name); + + nodelist->refcnt = 1; + + return DOM_NO_ERR; +} + +/** + * Finalise a dom_html_radio_nodelist object + * + * \param nodelist The dom_html_radio_nodelist object + */ +void _dom_html_radio_nodelist_finalise(struct dom_html_radio_nodelist *nodelist) +{ + assert(nodelist->refcnt == 0); + dom_node_unref(nodelist->form); + nodelist->form = NULL; + dom_string_unref(nodelist->name); + nodelist->name = NULL; + dom_html_collection_unref(nodelist->col); + nodelist->col = NULL; +} + +/** + * Destroy a dom_html_radio_nodelist object + * + * \param nodelist The dom_html_radio_nodelist object + */ +void _dom_html_radio_nodelist_destroy(struct dom_html_radio_nodelist *nodelist) +{ + _dom_html_radio_nodelist_finalise(nodelist); + free(nodelist); +} + +/*-----------------------------------------------------------------------*/ +/* Public API */ + +/** + * Claim a reference on this radio nodelist + * + * \param nodelist The radio nodelist object + */ +void dom_html_radio_nodelist_ref(dom_html_radio_nodelist *nodelist) +{ + if (nodelist == NULL) + return; + + nodelist->refcnt ++; +} + +/** + * Relese a reference on this radio nodelist + * + * \param nodelist The radio nodelist object + */ +void dom_html_radio_nodelist_unref(dom_html_radio_nodelist *nodelist) +{ + if (nodelist == NULL) + return; + + if (nodelist->refcnt > 0) + nodelist->refcnt --; + + if (nodelist->refcnt == 0) + _dom_html_radio_nodelist_destroy(nodelist); +} diff --git a/src/html/html_radio_nodelist.h b/src/html/html_radio_nodelist.h new file mode 100644 index 0000000..ffb2b12 --- /dev/null +++ b/src/html/html_radio_nodelist.h @@ -0,0 +1,35 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#ifndef dom_internal_html_radio_nodelist_h_ +#define dom_internal_html_radio_nodelist_h_ + +#include <dom/html/html_collection.h> + +struct dom_html_form_element; + +struct dom_html_radio_nodelist { + uint32_t refcnt; /**< The reference count of the nodelist */ + dom_string *name; /**< The name used for the nodelist */ + struct dom_html_form_element *form; /**< The form on which we constructed */ + dom_html_collection *col; /**< the underlying collection */ +}; + +dom_exception _dom_html_radio_nodelist_create(struct dom_html_form_element *form, + dom_string *name, + struct dom_html_radio_nodelist **nodelist); + +dom_exception _dom_html_radio_nodelist_initialise(struct dom_html_form_element *form, + struct dom_html_radio_nodelist *nodelist, + dom_string *name); + +void _dom_html_radio_nodelist_finalise(struct dom_html_radio_nodelist *nodelist); + +void _dom_html_radio_nodelist_destroy(struct dom_html_radio_nodelist *nodelist); + + +#endif ----------------------------------------------------------------------- Summary of changes: include/dom/html/html_radio_nodelist.h | 18 +-- src/html/Makefile | 1 + src/html/html_form_controls_collection.c | 4 +- src/html/html_form_controls_collection.h | 3 + src/html/html_radio_nodelist.c | 199 ++++++++++++++++++++++++++++++ src/html/html_radio_nodelist.h | 35 ++++++ 6 files changed, 248 insertions(+), 12 deletions(-) create mode 100644 src/html/html_radio_nodelist.c create mode 100644 src/html/html_radio_nodelist.h diff --git a/include/dom/html/html_radio_nodelist.h b/include/dom/html/html_radio_nodelist.h index 502df38..fd4c710 100644 --- a/include/dom/html/html_radio_nodelist.h +++ b/include/dom/html/html_radio_nodelist.h @@ -5,29 +5,29 @@ * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> */ -#ifndef dom_html_radionodelist_h_ -#define dom_html_radionodelist_h_ +#ifndef dom_html_radio_nodelist_h_ +#define dom_html_radio_nodelist_h_ #include <dom/core/exceptions.h> #include <dom/core/string.h> struct dom_node; -typedef struct dom_html_radionodelist dom_html_radionodelist; +typedef struct dom_html_radio_nodelist dom_html_radio_nodelist; -dom_exception dom_html_radionodelist_get_length(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_get_length(dom_html_radio_nodelist *col, uint32_t *len); -dom_exception dom_html_radionodelist_item(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_item(dom_html_radio_nodelist *col, uint32_t index, struct dom_node **node); -dom_exception dom_html_radionodelist_get_value(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_get_value(dom_html_radio_nodelist *col, dom_string **value); -dom_exception dom_html_radionodelist_set_value(dom_html_radionodelist *col, +dom_exception dom_html_radio_nodelist_set_value(dom_html_radio_nodelist *col, dom_string **value); -void dom_html_radionodelist_ref(dom_html_radionodelist *col); -void dom_html_radionodelist_unref(dom_html_radionodelist *col); +void dom_html_radio_nodelist_ref(dom_html_radio_nodelist *col); +void dom_html_radio_nodelist_unref(dom_html_radio_nodelist *col); #endif diff --git a/src/html/Makefile b/src/html/Makefile index cf864bb..55a2d15 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -19,6 +19,7 @@ DIR_SOURCES := \ html_tablecell_element.c html_tablecol_element.c html_tablesection_element.c \ html_table_element.c html_tablerow_element.c html_frameset_element.c \ html_frame_element.c html_iframe_element.c html_isindex_element.c \ + html_radio_nodelist.c \ UNINMPLEMENTED_SOURCES := \ diff --git a/src/html/html_form_controls_collection.c b/src/html/html_form_controls_collection.c index 34a3bb4..241a44d 100644 --- a/src/html/html_form_controls_collection.c +++ b/src/html/html_form_controls_collection.c @@ -23,14 +23,12 @@ #include "core/element.h" #include "core/string.h" -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); - /*-----------------------------------------------------------------------*/ /* Internal functions */ /* Callback function to test whether certain node is a form control, see * src/html/html_collection.h for detail. */ -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) +bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) { struct dom_html_document *doc = (struct dom_html_document *)(node->owner); diff --git a/src/html/html_form_controls_collection.h b/src/html/html_form_controls_collection.h index 36cdce0..2604c38 100644 --- a/src/html/html_form_controls_collection.h +++ b/src/html/html_form_controls_collection.h @@ -14,6 +14,9 @@ struct dom_html_form_element; +/* Exposed so that the radio nodelist can use it as a sub-criterion */ +bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); + dom_exception _dom_html_form_controls_collection_create(struct dom_html_form_element *form, dom_html_form_controls_collection **col); diff --git a/src/html/html_radio_nodelist.c b/src/html/html_radio_nodelist.c new file mode 100644 index 0000000..231900e --- /dev/null +++ b/src/html/html_radio_nodelist.c @@ -0,0 +1,199 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#include <assert.h> +#include <stdlib.h> + +#include <libwapcaplet/libwapcaplet.h> + +#include <dom/html/html_radio_nodelist.h> + +#include "html/html_radio_nodelist.h" +#include "html/html_form_controls_collection.h" +#include "html/html_document.h" +#include "html/html_form_element.h" + +#include "core/node.h" +#include "core/element.h" +#include "core/string.h" + +/*-----------------------------------------------------------------------*/ +/* Internal functions */ + +/* Callback function to test whether certain node is a form control, see + * src/html/html_collection.h for detail. */ +static bool _dom_is_specific_form_control(struct dom_node_internal *node, void *ctx) +{ + struct dom_html_document *doc = + (struct dom_html_document *)(node->owner); + struct dom_html_radio_nodelist *nodelist = ctx; + dom_string *str; + dom_exception exc; + + if (_dom_is_form_control(node, nodelist->form)) { + /* It's the control we care about if id or name are equal + * to nodelist->name. We wouldn't be here if node wasn't + * an element node. + */ + exc = _dom_element_get_id((struct dom_element *)node, &str); + + if (exc != DOM_NO_ERR) { + return false; + } + + if (str != NULL && dom_string_isequal(str, nodelist->name)) { + dom_string_unref(str); + return true; + } + + if (str != NULL) + dom_string_unref(str); + + exc = _dom_element_get_attribute((struct dom_element *)node, + doc->memoised[hds_name], &str); + + if (str != NULL && dom_string_isequal(str, nodelist->name)) { + dom_string_unref(str); + return true; + } + + if (str != NULL) + dom_string_unref(str); + } + + return false; +} + +/** + * Create a dom_html_radio_nodelist + * + * \param form The HTML form element for the radio nodelist + * \param name The element id/name for the radio nodelist + * \param nodelist The result radio nodelist object + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_radio_nodelist_create(struct dom_html_form_element *form, + dom_string *name, + struct dom_html_radio_nodelist **nodelist) +{ + dom_exception exc; + *nodelist = malloc(sizeof(struct dom_html_radio_nodelist)); + + if (*nodelist == NULL) + return DOM_NO_MEM_ERR; + + exc = _dom_html_radio_nodelist_initialise(form, *nodelist, name); + + if (exc != DOM_NO_ERR) { + /* This is safe because we only ever get an error before we + * ref anything which would need finalising + */ + free(*nodelist); + *nodelist = NULL; + } + + return exc; +} + +/** + * Initialise a dom_html_radio_nodelist + * + * \param form The HTML form element for the radio nodelist + * \param nodelist The radio nodelist object to initialise + * \param name The element id/name for the radio nodelist + * \return DOM_NO_ERR on success, appropriate dom_exception on failure. + */ +dom_exception _dom_html_radio_nodelist_initialise(struct dom_html_form_element *form, + struct dom_html_radio_nodelist *nodelist, + dom_string *name) +{ + dom_exception exc; + dom_html_document *doc = (dom_html_document *) dom_node_get_owner(form); + + assert(form != NULL); + assert(name != NULL); + + assert(doc != NULL); + + exc = _dom_html_collection_create(doc, + (dom_node_internal *) doc, + _dom_is_specific_form_control, + nodelist, &nodelist->col); + + if (exc != DOM_NO_ERR) + return exc; + + nodelist->form = form; + dom_node_ref(form); + + nodelist->name = name; + dom_string_ref(name); + + nodelist->refcnt = 1; + + return DOM_NO_ERR; +} + +/** + * Finalise a dom_html_radio_nodelist object + * + * \param nodelist The dom_html_radio_nodelist object + */ +void _dom_html_radio_nodelist_finalise(struct dom_html_radio_nodelist *nodelist) +{ + assert(nodelist->refcnt == 0); + dom_node_unref(nodelist->form); + nodelist->form = NULL; + dom_string_unref(nodelist->name); + nodelist->name = NULL; + dom_html_collection_unref(nodelist->col); + nodelist->col = NULL; +} + +/** + * Destroy a dom_html_radio_nodelist object + * + * \param nodelist The dom_html_radio_nodelist object + */ +void _dom_html_radio_nodelist_destroy(struct dom_html_radio_nodelist *nodelist) +{ + _dom_html_radio_nodelist_finalise(nodelist); + free(nodelist); +} + +/*-----------------------------------------------------------------------*/ +/* Public API */ + +/** + * Claim a reference on this radio nodelist + * + * \param nodelist The radio nodelist object + */ +void dom_html_radio_nodelist_ref(dom_html_radio_nodelist *nodelist) +{ + if (nodelist == NULL) + return; + + nodelist->refcnt ++; +} + +/** + * Relese a reference on this radio nodelist + * + * \param nodelist The radio nodelist object + */ +void dom_html_radio_nodelist_unref(dom_html_radio_nodelist *nodelist) +{ + if (nodelist == NULL) + return; + + if (nodelist->refcnt > 0) + nodelist->refcnt --; + + if (nodelist->refcnt == 0) + _dom_html_radio_nodelist_destroy(nodelist); +} diff --git a/src/html/html_radio_nodelist.h b/src/html/html_radio_nodelist.h new file mode 100644 index 0000000..ffb2b12 --- /dev/null +++ b/src/html/html_radio_nodelist.h @@ -0,0 +1,35 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#ifndef dom_internal_html_radio_nodelist_h_ +#define dom_internal_html_radio_nodelist_h_ + +#include <dom/html/html_collection.h> + +struct dom_html_form_element; + +struct dom_html_radio_nodelist { + uint32_t refcnt; /**< The reference count of the nodelist */ + dom_string *name; /**< The name used for the nodelist */ + struct dom_html_form_element *form; /**< The form on which we constructed */ + dom_html_collection *col; /**< the underlying collection */ +}; + +dom_exception _dom_html_radio_nodelist_create(struct dom_html_form_element *form, + dom_string *name, + struct dom_html_radio_nodelist **nodelist); + +dom_exception _dom_html_radio_nodelist_initialise(struct dom_html_form_element *form, + struct dom_html_radio_nodelist *nodelist, + dom_string *name); + +void _dom_html_radio_nodelist_finalise(struct dom_html_radio_nodelist *nodelist); + +void _dom_html_radio_nodelist_destroy(struct dom_html_radio_nodelist *nodelist); + + +#endif -- Document Object Model library

5 years, 4 months

1
0
0 / 0

netsurf: branch master updated. release/3.7-47-gf04cede

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/f04cedef1c7742f38b0b5... ...commit http://git.netsurf-browser.org/netsurf.git/commit/f04cedef1c7742f38b0b561... ...tree http://git.netsurf-browser.org/netsurf.git/tree/f04cedef1c7742f38b0b561ef... The branch, master has been updated via f04cedef1c7742f38b0b561efcd77e0476fcbf60 (commit) from c03405b3b3b28942d50f672e897be5cfc0f6c540 (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=f04cedef1c7742f38b0... commit f04cedef1c7742f38b0b561efcd77e0476fcbf60 Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Debian(ish): use libssl1.0-dev if it exists diff --git a/docs/env.sh b/docs/env.sh index bb2cbab..f1c89a8 100644 --- a/docs/env.sh +++ b/docs/env.sh @@ -25,7 +25,7 @@ ############################################################################### # deb packages for dpkg based systems -NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libssl-dev libpng-dev libjpeg-dev" +NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libpng-dev libjpeg-dev" NS_TOOL_DEB="flex bison libhtml-parser-perl" if [ "x${NETSURF_GTK_MAJOR}" = "x3" ]; then NS_GTK_DEB="libgtk-3-dev librsvg2-dev" @@ -36,6 +36,11 @@ fi # apt get commandline to install necessary dev packages ns-apt-get-install() { + if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then + NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev" + else + NS_DEV_DEB="${NS_DEV_DEB} libssl-dev" + fi sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB}) } ----------------------------------------------------------------------- Summary of changes: docs/env.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/docs/env.sh b/docs/env.sh index bb2cbab..f1c89a8 100644 --- a/docs/env.sh +++ b/docs/env.sh @@ -25,7 +25,7 @@ ############################################################################### # deb packages for dpkg based systems -NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libssl-dev libpng-dev libjpeg-dev" +NS_DEV_DEB="build-essential pkg-config git gperf libcurl3-dev libpng-dev libjpeg-dev" NS_TOOL_DEB="flex bison libhtml-parser-perl" if [ "x${NETSURF_GTK_MAJOR}" = "x3" ]; then NS_GTK_DEB="libgtk-3-dev librsvg2-dev" @@ -36,6 +36,11 @@ fi # apt get commandline to install necessary dev packages ns-apt-get-install() { + if /usr/bin/apt-cache show libssl1.0-dev >/dev/null 2>&1; then + NS_DEV_DEB="${NS_DEV_DEB} libssl1.0-dev" + else + NS_DEV_DEB="${NS_DEV_DEB} libssl-dev" + fi sudo apt-get install $(echo ${NS_DEV_DEB} ${NS_TOOL_DEB} ${NS_GTK_DEB}) } -- NetSurf Browser

5 years, 4 months

1
0
0 / 0

libdom: branch dsilvers/forms1 updated. release/0.3.2-7-gf192fc6

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/f192fc62a9a59fa26f5be1... ...commit http://git.netsurf-browser.org/libdom.git/commit/f192fc62a9a59fa26f5be15a... ...tree http://git.netsurf-browser.org/libdom.git/tree/f192fc62a9a59fa26f5be15a07... The branch, dsilvers/forms1 has been updated via f192fc62a9a59fa26f5be15a07e36a9c80d3121f (commit) from 2f79b302848cc25c05c3dfb80fd425f3c1d97bd8 (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/libdom.git/commit/?id=f192fc62a9a59fa26f5b... commit f192fc62a9a59fa26f5be15a07e36a9c80d3121f Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> foldme; whitespace tweak diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index ca11706..b3ac05f 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -201,10 +201,10 @@ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, dom_html_form_controls_collection *col; err = dom_html_form_element_get_elements(ele, &col); + if (err != DOM_NO_ERR) return err; - err = dom_html_form_controls_collection_get_length(col, len); dom_html_form_controls_collection_unref(col); ----------------------------------------------------------------------- Summary of changes: src/html/html_form_element.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index ca11706..b3ac05f 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -201,10 +201,10 @@ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, dom_html_form_controls_collection *col; err = dom_html_form_element_get_elements(ele, &col); + if (err != DOM_NO_ERR) return err; - err = dom_html_form_controls_collection_get_length(col, len); dom_html_form_controls_collection_unref(col); -- Document Object Model library

5 years, 4 months

1
0
0 / 0

libnslog: branch master updated. release/0.1.0-1-gbb1761f

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libnslog.git/shortlog/bb1761f596e792fa2552... ...commit http://git.netsurf-browser.org/libnslog.git/commit/bb1761f596e792fa2552ad... ...tree http://git.netsurf-browser.org/libnslog.git/tree/bb1761f596e792fa2552ad24... The branch, master has been updated via bb1761f596e792fa2552ad246b603a9a58d4ecae (commit) from 63fc81f84d3ecbbeb5ae336dae0f1be07aa329b4 (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/libnslog.git/commit/?id=bb1761f596e792fa25... commit bb1761f596e792fa2552ad246b603a9a58d4ecae Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Silence compiler warning diff --git a/src/filter-lexer.l b/src/filter-lexer.l index bbd11eb..f640d48 100644 --- a/src/filter-lexer.l +++ b/src/filter-lexer.l @@ -26,6 +26,8 @@ #define YYLTYPE FILTER_LTYPE #endif +/* Ensure we use yylloc to silence "variable `yylloc` set but not used" warning */ +#define YY_USER_ACTION yylloc->first_line = yylloc->last_line = yylineno; %} ----------------------------------------------------------------------- Summary of changes: src/filter-lexer.l | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/filter-lexer.l b/src/filter-lexer.l index bbd11eb..f640d48 100644 --- a/src/filter-lexer.l +++ b/src/filter-lexer.l @@ -26,6 +26,8 @@ #define YYLTYPE FILTER_LTYPE #endif +/* Ensure we use yylloc to silence "variable `yylloc` set but not used" warning */ +#define YY_USER_ACTION yylloc->first_line = yylloc->last_line = yylineno; %} -- NetSurf Parametric Logging Library

5 years, 4 months

1
0
0 / 0

nsgenbind: branch master updated. release/0.5-1-ge534d44

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/nsgenbind.git/shortlog/e534d44bb67698168cd... ...commit http://git.netsurf-browser.org/nsgenbind.git/commit/e534d44bb67698168cd52... ...tree http://git.netsurf-browser.org/nsgenbind.git/tree/e534d44bb67698168cd5241... The branch, master has been updated via e534d44bb67698168cd5241291309c8d2a22bfdf (commit) from 82d7ecb2e21bd5f737c825ad8ccd0d7be82fe4a1 (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/nsgenbind.git/commit/?id=e534d44bb67698168... commit e534d44bb67698168cd5241291309c8d2a22bfdf Author: John-Mark Bell <jmb(a)netsurf-browser.org> Commit: John-Mark Bell <jmb(a)netsurf-browser.org> Fix YYLTYPE nonsense with bison >=3.0 diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y index fd41c37..d73401e 100644 --- a/src/nsgenbind-parser.y +++ b/src/nsgenbind-parser.y @@ -20,7 +20,15 @@ %code requires { +#ifndef YYLTYPE +/* Bison <3.0 */ #define YYLTYPE YYLTYPE +#else +/* Bison 3.0 or later */ +/* Keep in sync with the defined API prefix */ +#define NSGENBIND_LTYPE_IS_DECLARED 1 +#endif + typedef struct YYLTYPE { struct YYLTYPE *next; int start_line; ----------------------------------------------------------------------- Summary of changes: src/nsgenbind-parser.y | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/nsgenbind-parser.y b/src/nsgenbind-parser.y index fd41c37..d73401e 100644 --- a/src/nsgenbind-parser.y +++ b/src/nsgenbind-parser.y @@ -20,7 +20,15 @@ %code requires { +#ifndef YYLTYPE +/* Bison <3.0 */ #define YYLTYPE YYLTYPE +#else +/* Bison 3.0 or later */ +/* Keep in sync with the defined API prefix */ +#define NSGENBIND_LTYPE_IS_DECLARED 1 +#endif + typedef struct YYLTYPE { struct YYLTYPE *next; int start_line; -- NetSurf Generator for JavaScript bindings

5 years, 4 months

1
0
0 / 0

libdom: branch dsilvers/forms1 created. release/0.3.2-6-g2f79b30

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/libdom.git/shortlog/2f79b302848cc25c05c3df... ...commit http://git.netsurf-browser.org/libdom.git/commit/2f79b302848cc25c05c3dfb8... ...tree http://git.netsurf-browser.org/libdom.git/tree/2f79b302848cc25c05c3dfb80f... The branch, dsilvers/forms1 has been created at 2f79b302848cc25c05c3dfb80fd425f3c1d97bd8 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=2f79b302848cc25c05c3... commit 2f79b302848cc25c05c3dfb80fd425f3c1d97bd8 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Ensure we install the extra headers diff --git a/Makefile b/Makefile index 984a020..6db4201 100644 --- a/Makefile +++ b/Makefile @@ -89,6 +89,8 @@ Is := include/dom/html I := /$(INCLUDEDIR)/dom/html INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_document.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_collection.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_radio_nodelist.h +INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_form_controls_collection.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_element.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_elements.h INSTALL_ITEMS := $(INSTALL_ITEMS) $(I):$(Is)/html_html_element.h commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=e60642b7cd8a8e23e796... commit e60642b7cd8a8e23e7963c44dbbc8cd879d88372 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> stuff; form controls collection initial impl diff --git a/include/dom/html/html_form_element.h b/include/dom/html/html_form_element.h index 6a64dff..fe4bf3f 100644 --- a/include/dom/html/html_form_element.h +++ b/include/dom/html/html_form_element.h @@ -11,12 +11,12 @@ #include <dom/core/exceptions.h> #include <dom/core/string.h> -struct dom_html_form_controls_collection; +#include <dom/html/html_form_controls_collection.h> typedef struct dom_html_form_element dom_html_form_element; dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, - struct dom_html_form_controls_collection **col); + dom_html_form_controls_collection **col); dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, uint32_t *len); diff --git a/src/html/Makefile b/src/html/Makefile index c98ce9a..cf864bb 100644 --- a/src/html/Makefile +++ b/src/html/Makefile @@ -3,7 +3,7 @@ DIR_SOURCES := \ html_document.c html_collection.c html_options_collection.c \ html_element.c html_html_element.c html_head_element.c \ html_link_element.c html_title_element.c html_meta_element.c \ - html_base_element.c html_style_element.c \ + html_base_element.c html_style_element.c html_form_controls_collection.c \ html_body_element.c html_form_element.c html_select_element.c \ html_button_element.c html_input_element.c html_text_area_element.c \ html_opt_group_element.c html_option_element.c html_hr_element.c \ diff --git a/src/html/html_form_controls_collection.c b/src/html/html_form_controls_collection.c new file mode 100644 index 0000000..34a3bb4 --- /dev/null +++ b/src/html/html_form_controls_collection.c @@ -0,0 +1,71 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#include <assert.h> +#include <stdlib.h> + +#include <libwapcaplet/libwapcaplet.h> + +#include "html/html_form_controls_collection.h" +#include "html/html_document.h" +#include "html/html_form_element.h" + +#include "html/html_input_element.h" +#include "html/html_select_element.h" +#include "html/html_text_area_element.h" +#include "html/html_button_element.h" + +#include "core/node.h" +#include "core/element.h" +#include "core/string.h" + +static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); + +/*-----------------------------------------------------------------------*/ +/* Internal functions */ + +/* Callback function to test whether certain node is a form control, see + * src/html/html_collection.h for detail. */ +static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) +{ + struct dom_html_document *doc = + (struct dom_html_document *)(node->owner); + struct dom_html_form_element *form = ctx; + + + assert(node->type == DOM_ELEMENT_NODE); + + /* Form controls are INPUT TEXTAREA SELECT and BUTTON*/ + if (dom_string_caseless_isequal(node->name, + doc->elements[DOM_HTML_ELEMENT_TYPE_INPUT])) + return ((dom_html_input_element *)node)->form == form; + if (dom_string_caseless_isequal(node->name, + doc->elements[DOM_HTML_ELEMENT_TYPE_TEXTAREA])) + return ((dom_html_text_area_element *)node)->form == form; + if (dom_string_caseless_isequal(node->name, + doc->elements[DOM_HTML_ELEMENT_TYPE_SELECT])) + return ((dom_html_select_element *)node)->form == form; + if (dom_string_caseless_isequal(node->name, + doc->elements[DOM_HTML_ELEMENT_TYPE_BUTTON])) { + return ((dom_html_button_element *)node)->form == form; + } + + return false; +} + + +dom_exception _dom_html_form_controls_collection_create(struct dom_html_form_element *form, + dom_html_form_controls_collection **col) +{ + dom_html_document *doc = (dom_html_document *) dom_node_get_owner(form); + + assert(doc != NULL); + + return _dom_html_collection_create(doc, + (dom_node_internal *) doc, + _dom_is_form_control, form, col); +} diff --git a/src/html/html_form_controls_collection.h b/src/html/html_form_controls_collection.h new file mode 100644 index 0000000..36cdce0 --- /dev/null +++ b/src/html/html_form_controls_collection.h @@ -0,0 +1,20 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#ifndef dom_internal_html_form_controls_collection_h_ +#define dom_internal_html_form_controls_collection_h_ + +#include <dom/html/html_form_controls_collection.h> + +#include "html/html_collection.h" + +struct dom_html_form_element; + +dom_exception _dom_html_form_controls_collection_create(struct dom_html_form_element *form, + dom_html_form_controls_collection **col); + +#endif diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index bc71440..ca11706 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -11,12 +11,8 @@ #include <dom/html/html_form_element.h> #include "html/html_form_element.h" -#include "html/html_input_element.h" -#include "html/html_select_element.h" -#include "html/html_text_area_element.h" -#include "html/html_button_element.h" -#include "html/html_collection.h" +#include "html/html_form_controls_collection.h" #include "html/html_document.h" #include "core/node.h" @@ -29,8 +25,6 @@ static struct dom_element_protected_vtable _protect_vtable = { DOM_HTML_FORM_ELEMENT_PROTECT_VTABLE }; -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx); - /** * Create a dom_html_form_element object * @@ -173,22 +167,17 @@ dom_exception _dom_html_form_element_copy_internal( * \return DOM_NO_ERR on success, appropriate dom_exception on failure. */ dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, - struct dom_html_collection **col) + dom_html_form_controls_collection **col) { dom_exception err; - dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); - - assert(doc != NULL); if (ele->elements != NULL) { dom_html_form_controls_collection_ref(ele->elements); *col = ele->elements; return DOM_NO_ERR; } - - err = _dom_html_collection_create(doc, - (dom_node_internal *) doc, - _dom_is_form_control, ele, col); + + err = _dom_html_form_controls_collection_create(ele, col); if (err == DOM_NO_ERR) { dom_html_form_controls_collection_ref(*col); @@ -209,10 +198,8 @@ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, uint32_t *len) { dom_exception err; - dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); dom_html_form_controls_collection *col; - assert(doc != NULL); err = dom_html_form_element_get_elements(ele, &col); if (err != DOM_NO_ERR) return err; @@ -310,36 +297,3 @@ dom_exception dom_html_form_element_reset(dom_html_form_element *ele) doc->memoised[hds_reset], true, true, &success); } - -/*-----------------------------------------------------------------------*/ -/* Internal functions */ - -/* Callback function to test whether certain node is a form control, see - * src/html/html_collection.h for detail. */ -static bool _dom_is_form_control(struct dom_node_internal *node, void *ctx) -{ - struct dom_html_document *doc = - (struct dom_html_document *)(node->owner); - struct dom_html_form_element *form = ctx; - - - assert(node->type == DOM_ELEMENT_NODE); - - /* Form controls are INPUT TEXTAREA SELECT and BUTTON*/ - if (dom_string_caseless_isequal(node->name, - doc->elements[DOM_HTML_ELEMENT_TYPE_INPUT])) - return ((dom_html_input_element *)node)->form == form; - if (dom_string_caseless_isequal(node->name, - doc->elements[DOM_HTML_ELEMENT_TYPE_TEXTAREA])) - return ((dom_html_text_area_element *)node)->form == form; - if (dom_string_caseless_isequal(node->name, - doc->elements[DOM_HTML_ELEMENT_TYPE_SELECT])) - return ((dom_html_select_element *)node)->form == form; - if (dom_string_caseless_isequal(node->name, - doc->elements[DOM_HTML_ELEMENT_TYPE_BUTTON])) { - return ((dom_html_button_element *)node)->form == form; - } - - return false; -} - diff --git a/src/html/html_form_element.h b/src/html/html_form_element.h index 43ed49f..4a75379 100644 --- a/src/html/html_form_element.h +++ b/src/html/html_form_element.h @@ -12,12 +12,10 @@ #include "html/html_element.h" -struct dom_html_form_controls_collection; - struct dom_html_form_element { struct dom_html_element base; /**< The base class */ - struct dom_html_form_controls_collection *elements; + dom_html_form_controls_collection *elements; /**< The elements collection (memoised) */ }; commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=25eb4f93dd6b130bc262... commit 25eb4f93dd6b130bc262a824326f98ba337f32e4 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> foldme; form controls collection underscores (headers) diff --git a/include/dom/html/html_form_controls_collection.h b/include/dom/html/html_form_controls_collection.h index 45c30d6..23a1725 100644 --- a/include/dom/html/html_form_controls_collection.h +++ b/include/dom/html/html_form_controls_collection.h @@ -5,8 +5,8 @@ * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> */ -#ifndef dom_html_formcontrolscollection_h_ -#define dom_html_formcontrolscollection_h_ +#ifndef dom_html_form_controls_collection_h_ +#define dom_html_form_controls_collection_h_ #include <dom/core/exceptions.h> #include <dom/core/string.h> @@ -14,24 +14,24 @@ struct dom_node; struct dom_html_radionodelist; -typedef struct dom_html_collection dom_html_formcontrolscollection; +typedef struct dom_html_collection dom_html_form_controls_collection; -#define dom_html_formcontrolscollection_get_length(col, len) \ +#define dom_html_form_controls_collection_get_length(col, len) \ dom_html_collection_get_length((dom_html_collection *)(col), (len)) -#define dom_html_formcontrolscollection_item(col, index, node) \ +#define dom_html_form_controls_collection_item(col, index, node) \ dom_html_collection((dom_html_collection *)(col), (index), (node)) -#define dom_html_formcontrolscollection_named_item(col, name, node) \ +#define dom_html_form_controls_collection_named_item(col, name, node) \ dom_html_collection((dom_html_collection *)(col), (name), (node)) -dom_exception dom_html_formcontrolscollection_named_items(dom_html_formcontrolscollection *col, +dom_exception dom_html_form_controls_collection_named_items(dom_html_form_controls_collection *col, dom_string *name, struct dom_html_radionodelist **nodes); -#define dom_html_formcontrolscollection_ref(col) \ +#define dom_html_form_controls_collection_ref(col) \ dom_html_collection_ref((dom_html_collection *)(col)) -#define dom_html_formcontrolscollection_unref(col) \ +#define dom_html_form_controls_collection_unref(col) \ dom_html_collection_unref((dom_html_collection *)(col)) #endif commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=617864f69943446e72b6... commit 617864f69943446e72b6ba0bbe56d87b76aa0d5c Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> foldme; form controls collection is a newtype (headers) diff --git a/include/dom/html/html_form_controls_collection.h b/include/dom/html/html_form_controls_collection.h index db3039b..45c30d6 100644 --- a/include/dom/html/html_form_controls_collection.h +++ b/include/dom/html/html_form_controls_collection.h @@ -14,19 +14,25 @@ struct dom_node; struct dom_html_radionodelist; -typedef struct dom_html_formcontrolscollection dom_html_formcontrolscollection; - -dom_exception dom_html_formcontrolscollection_get_length(dom_html_formcontrolscollection *col, - uint32_t *len); -dom_exception dom_html_formcontrolscollection_item(dom_html_formcontrolscollection *col, - uint32_t index, struct dom_node **node); -dom_exception dom_html_formcontrolscollection_named_item(dom_html_formcontrolscollection *col, - dom_string *name, struct dom_node **node); +typedef struct dom_html_collection dom_html_formcontrolscollection; + +#define dom_html_formcontrolscollection_get_length(col, len) \ + dom_html_collection_get_length((dom_html_collection *)(col), (len)) + +#define dom_html_formcontrolscollection_item(col, index, node) \ + dom_html_collection((dom_html_collection *)(col), (index), (node)) + +#define dom_html_formcontrolscollection_named_item(col, name, node) \ + dom_html_collection((dom_html_collection *)(col), (name), (node)) + dom_exception dom_html_formcontrolscollection_named_items(dom_html_formcontrolscollection *col, dom_string *name, struct dom_html_radionodelist **nodes); -void dom_html_formcontrolscollection_ref(dom_html_formcontrolscollection *col); -void dom_html_formcontrolscollection_unref(dom_html_formcontrolscollection *col); +#define dom_html_formcontrolscollection_ref(col) \ + dom_html_collection_ref((dom_html_collection *)(col)) + +#define dom_html_formcontrolscollection_unref(col) \ + dom_html_collection_unref((dom_html_collection *)(col)) #endif commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=fcf43a06d1ccf27c5051... commit fcf43a06d1ccf27c5051177b187430456547e80f Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> HTMLFormElement.elements is [sameobject] diff --git a/src/html/html_form_element.c b/src/html/html_form_element.c index 1dd1992..bc71440 100644 --- a/src/html/html_form_element.c +++ b/src/html/html_form_element.c @@ -71,6 +71,8 @@ dom_exception _dom_html_form_element_initialise( err = _dom_html_element_initialise(params, &ele->base); + ele->elements = NULL; + return err; } @@ -81,6 +83,10 @@ dom_exception _dom_html_form_element_initialise( */ void _dom_html_form_element_finalise(struct dom_html_form_element *ele) { + if (ele->elements != NULL) { + dom_html_form_controls_collection_unref(ele->elements); + ele->elements = NULL; + } _dom_html_element_finalise(&ele->base); } @@ -173,9 +179,22 @@ dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); assert(doc != NULL); + + if (ele->elements != NULL) { + dom_html_form_controls_collection_ref(ele->elements); + *col = ele->elements; + return DOM_NO_ERR; + } + err = _dom_html_collection_create(doc, (dom_node_internal *) doc, _dom_is_form_control, ele, col); + + if (err == DOM_NO_ERR) { + dom_html_form_controls_collection_ref(*col); + ele->elements = *col; + } + return err; } @@ -191,19 +210,17 @@ dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, { dom_exception err; dom_html_document *doc = (dom_html_document *) dom_node_get_owner(ele); - dom_html_collection *col; + dom_html_form_controls_collection *col; assert(doc != NULL); - err = _dom_html_collection_create(doc, - (dom_node_internal *) doc, - _dom_is_form_control, ele, &col); + err = dom_html_form_element_get_elements(ele, &col); if (err != DOM_NO_ERR) return err; - err = dom_html_collection_get_length(col, len); + err = dom_html_form_controls_collection_get_length(col, len); - dom_html_collection_unref(col); + dom_html_form_controls_collection_unref(col); return err; } diff --git a/src/html/html_form_element.h b/src/html/html_form_element.h index 4987820..43ed49f 100644 --- a/src/html/html_form_element.h +++ b/src/html/html_form_element.h @@ -12,11 +12,13 @@ #include "html/html_element.h" -struct dom_html_collection; +struct dom_html_form_controls_collection; struct dom_html_form_element { struct dom_html_element base; /**< The base class */ + struct dom_html_form_controls_collection *elements; + /**< The elements collection (memoised) */ }; /* Create a dom_html_form_element object */ commitdiff http://git.netsurf-browser.org/libdom.git/commit/?id=0152054b42e2a277aba4... commit 0152054b42e2a277aba4fdd6523f7455206c5c97 Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> reword; public api changes for new collections diff --git a/include/dom/dom.h b/include/dom/dom.h index 0740fe9..26f139c 100644 --- a/include/dom/dom.h +++ b/include/dom/dom.h @@ -40,6 +40,8 @@ /* DOM HTML headers */ #include <dom/html/html_collection.h> +#include <dom/html/html_radio_nodelist.h> +#include <dom/html/html_form_controls_collection.h> #include <dom/html/html_document.h> #include <dom/html/html_element.h> #include <dom/html/html_html_element.h> diff --git a/include/dom/html/html_form_controls_collection.h b/include/dom/html/html_form_controls_collection.h new file mode 100644 index 0000000..db3039b --- /dev/null +++ b/include/dom/html/html_form_controls_collection.h @@ -0,0 +1,32 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#ifndef dom_html_formcontrolscollection_h_ +#define dom_html_formcontrolscollection_h_ + +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +struct dom_node; +struct dom_html_radionodelist; + +typedef struct dom_html_formcontrolscollection dom_html_formcontrolscollection; + +dom_exception dom_html_formcontrolscollection_get_length(dom_html_formcontrolscollection *col, + uint32_t *len); +dom_exception dom_html_formcontrolscollection_item(dom_html_formcontrolscollection *col, + uint32_t index, struct dom_node **node); +dom_exception dom_html_formcontrolscollection_named_item(dom_html_formcontrolscollection *col, + dom_string *name, struct dom_node **node); +dom_exception dom_html_formcontrolscollection_named_items(dom_html_formcontrolscollection *col, + dom_string *name, struct dom_html_radionodelist **nodes); + +void dom_html_formcontrolscollection_ref(dom_html_formcontrolscollection *col); +void dom_html_formcontrolscollection_unref(dom_html_formcontrolscollection *col); + +#endif + diff --git a/include/dom/html/html_form_element.h b/include/dom/html/html_form_element.h index 81637a3..6a64dff 100644 --- a/include/dom/html/html_form_element.h +++ b/include/dom/html/html_form_element.h @@ -11,12 +11,12 @@ #include <dom/core/exceptions.h> #include <dom/core/string.h> -struct dom_html_collection; +struct dom_html_form_controls_collection; typedef struct dom_html_form_element dom_html_form_element; dom_exception dom_html_form_element_get_elements(dom_html_form_element *ele, - struct dom_html_collection **col); + struct dom_html_form_controls_collection **col); dom_exception dom_html_form_element_get_length(dom_html_form_element *ele, uint32_t *len); diff --git a/include/dom/html/html_radio_nodelist.h b/include/dom/html/html_radio_nodelist.h new file mode 100644 index 0000000..502df38 --- /dev/null +++ b/include/dom/html/html_radio_nodelist.h @@ -0,0 +1,33 @@ +/* + * This file is part of libdom. + * Licensed under the MIT License, + * http://www.opensource.org/licenses/mit-license.php + * Copyright 2018 Daniel Silverstone <dsilvers(a)netsurf-browser.org> + */ + +#ifndef dom_html_radionodelist_h_ +#define dom_html_radionodelist_h_ + +#include <dom/core/exceptions.h> +#include <dom/core/string.h> + +struct dom_node; + +typedef struct dom_html_radionodelist dom_html_radionodelist; + +dom_exception dom_html_radionodelist_get_length(dom_html_radionodelist *col, + uint32_t *len); +dom_exception dom_html_radionodelist_item(dom_html_radionodelist *col, + uint32_t index, struct dom_node **node); + +dom_exception dom_html_radionodelist_get_value(dom_html_radionodelist *col, + dom_string **value); + +dom_exception dom_html_radionodelist_set_value(dom_html_radionodelist *col, + dom_string **value); + +void dom_html_radionodelist_ref(dom_html_radionodelist *col); +void dom_html_radionodelist_unref(dom_html_radionodelist *col); + +#endif + ----------------------------------------------------------------------- -- Document Object Model library

5 years, 4 months

1
0
0 / 0

netsurf-wiki: branch master updated. 98700b487f755332ad8a3baf7f08186bcc7fabef

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf-wiki.git/shortlog/98700b487f755332... ...commit http://git.netsurf-browser.org/netsurf-wiki.git/commit/98700b487f755332ad... ...tree http://git.netsurf-browser.org/netsurf-wiki.git/tree/98700b487f755332ad8a... The branch, master has been updated via 98700b487f755332ad8a3baf7f08186bcc7fabef (commit) from bf47a3ac4dbc5f747e180ffce77ba122bc3eb88a (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-wiki.git/commit/?id=98700b487f7553... commit 98700b487f755332ad8a3baf7f08186bcc7fabef Author: Daniel Silverstone <dsilvers(a)digital-scurf.org> Commit: Daniel Silverstone <dsilvers(a)digital-scurf.org> Initial thoughts on a developer weekend diff --git a/developer-weekend/jan-2018.mdwn b/developer-weekend/jan-2018.mdwn new file mode 100644 index 0000000..f88c10c --- /dev/null +++ b/developer-weekend/jan-2018.mdwn @@ -0,0 +1,41 @@ +[[!meta title="Developer Weekend (January 2018)"]] +[[!meta author="Daniel Silverstone"]] +[[!meta date="2018-01-19 20:00:00"]] + +[[!toc]] + +Attendees +========= + +* Michael Drake +* Vincent Sanders +* Daniel Silverstone +* John-Mark Bell + +Apologies +========= + +* Chris Young + +Topics +====== + +* Form support in `libdom` +* Layout stuff (but not text) +* CSS Media Queries +* Examine the state of Sven's branch +* Consider merging Sprow's patches? +* Moar JavaScript. +* New Cookies RFC + + +Bug fixes +========= + + +Next time +========= + +We have chosen the next developer weekend to be 21/22 April. +It shall be at Males Close. + ----------------------------------------------------------------------- Summary of changes: developer-weekend/jan-2018.mdwn | 41 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 developer-weekend/jan-2018.mdwn diff --git a/developer-weekend/jan-2018.mdwn b/developer-weekend/jan-2018.mdwn new file mode 100644 index 0000000..f88c10c --- /dev/null +++ b/developer-weekend/jan-2018.mdwn @@ -0,0 +1,41 @@ +[[!meta title="Developer Weekend (January 2018)"]] +[[!meta author="Daniel Silverstone"]] +[[!meta date="2018-01-19 20:00:00"]] + +[[!toc]] + +Attendees +========= + +* Michael Drake +* Vincent Sanders +* Daniel Silverstone +* John-Mark Bell + +Apologies +========= + +* Chris Young + +Topics +====== + +* Form support in `libdom` +* Layout stuff (but not text) +* CSS Media Queries +* Examine the state of Sven's branch +* Consider merging Sprow's patches? +* Moar JavaScript. +* New Cookies RFC + + +Bug fixes +========= + + +Next time +========= + +We have chosen the next developer weekend to be 21/22 April. +It shall be at Males Close. + -- NetSurf Developer Wiki Backing Store

5 years, 4 months

1
0
0 / 0

netsurf: branch svenw/cocoa updated. release/3.7-90-g7b4163e

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/netsurf.git/shortlog/7b4163e02165388236301... ...commit http://git.netsurf-browser.org/netsurf.git/commit/7b4163e0216538823630113... ...tree http://git.netsurf-browser.org/netsurf.git/tree/7b4163e0216538823630113ed... The branch, svenw/cocoa has been updated via 7b4163e0216538823630113ed7534c319e19c385 (commit) via c03405b3b3b28942d50f672e897be5cfc0f6c540 (commit) via 128753cdcf0719b1afc919cb841fbc22bb9715aa (commit) via 891758bb6f363f10f9a673b167230735a9183244 (commit) via 6be6fa1b2197ffe6e511c5eff9abe14d883f8478 (commit) via a67973f312b7cba8a6d56f9841a542a731a9ddb4 (commit) via ae286be5a9a5c1150dfa7627f2b30a73238b506c (commit) via cf3eba081a048d413158350000352ff2b5e5f220 (commit) via 5776d3448c50d58af0eac8f3960200aa1b5fc1a0 (commit) via d1c656b55f7c21b5fb96bf5e1bd8fedaa55c4fc2 (commit) via 7bd1fb50c6415a21fae22f7bd534894e02b512bf (commit) from 40ae70a811c23b6ce0bf02a6ecbe9eab098ee52c (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=7b4163e021653882363... commit 7b4163e0216538823630113ed7534c319e19c385 Merge: 40ae70a c03405b Author: Sven Weidauer <sven(a)5sw.de> Commit: Sven Weidauer <sven(a)5sw.de> Merge remote-tracking branch 'origin/master' into svenw/cocoa ----------------------------------------------------------------------- Summary of changes: !NetSurf/Resources/ca-bundle | 1093 ++++----- content/handlers/css/dump.c | 39 + content/handlers/css/select.c | 52 +- content/handlers/css/select.h | 1 + content/handlers/css/utils.c | 144 +- content/handlers/css/utils.h | 46 +- desktop/print.c | 37 +- desktop/selection.c | 67 +- desktop/selection.h | 7 +- desktop/textarea.c | 46 +- desktop/textarea.h | 8 +- render/box.c | 41 +- render/box.h | 11 +- render/box_construct.c | 23 +- render/box_normalise.c | 97 +- render/box_textarea.c | 11 +- render/font.c | 8 +- render/font.h | 11 +- render/form.c | 3 +- render/html.c | 15 +- render/html_interaction.c | 12 +- render/html_internal.h | 4 + render/html_object.c | 6 +- render/html_redraw.c | 41 +- render/layout.c | 5187 +++++++++++++++++++++-------------------- render/layout.h | 31 - render/search.c | 5 +- render/table.c | 319 ++- render/table.h | 8 +- render/textplain.c | 2 +- utils/filename.c | 21 +- 31 files changed, 3876 insertions(+), 3520 deletions(-) diff --git a/!NetSurf/Resources/ca-bundle b/!NetSurf/Resources/ca-bundle index 76adf83..39ba336 100644 --- a/!NetSurf/Resources/ca-bundle +++ b/!NetSurf/Resources/ca-bundle @@ -1,20 +1,20 @@ ## ## Bundle of CA Root Certificates ## -## Certificate data from Mozilla as of: Wed Jan 20 04:12:04 2016 +## Certificate data from Mozilla as of: Wed Sep 20 03:12:05 2017 GMT ## ## This is a bundle of X.509 certificates of public Certificate Authorities ## (CA). These were automatically extracted from Mozilla's root certificates ## file (certdata.txt). This file can be found in the mozilla source tree: -## http://hg.mozilla.org/releases/mozilla-release/raw-file/default/security/... +## https://hg.mozilla.org/releases/mozilla-release/raw-file/default/security... ## ## It contains the certificates in PEM format and therefore ## can be directly used with curl / libcurl / php_curl, or with ## an Apache+mod_ssl webserver for SSL client authentication. ## Just configure this file as the SSLCACertificateFile. ## -## Conversion done with mk-ca-bundle.pl version 1.25. -## SHA1: 0ab47e2f41518f8d223eab517cb799e5b071231e +## Conversion done with mk-ca-bundle.pl version 1.27. +## SHA256: 2b2dbe5244e0047e088c597998883a913f6c5fffd1cb5c0fe5a368c8466cb2ec ## @@ -130,30 +130,6 @@ Y71k5h+3zvDyny67G7fyUIhzksLi4xaNmjICq44Y3ekQEe5+NauQrz4wlHrQMz2nZQ/1/I6eYs9H RCwBXbsdtTLSR9I4LtD+gdwyah617jzV/OeBHRnDJELqYzmp -----END CERTIFICATE----- -AddTrust Low-Value Services Root -================================ ------BEGIN CERTIFICATE----- -MIIEGDCCAwCgAwIBAgIBATANBgkqhkiG9w0BAQUFADBlMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEwHwYDVQQDExhBZGRU -cnVzdCBDbGFzcyAxIENBIFJvb3QwHhcNMDAwNTMwMTAzODMxWhcNMjAwNTMwMTAzODMxWjBlMQsw -CQYDVQQGEwJTRTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBO -ZXR3b3JrMSEwHwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3QwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQCWltQhSWDia+hBBwzexODcEyPNwTXH+9ZOEQpnXvUGW2ulCDtbKRY6 -54eyNAbFvAWlA3yCyykQruGIgb3WntP+LVbBFc7jJp0VLhD7Bo8wBN6ntGO0/7Gcrjyvd7ZWxbWr -oulpOj0OM3kyP3CCkplhbY0wCI9xP6ZIVxn4JdxLZlyldI+Yrsj5wAYi56xz36Uu+1LcsRVlIPo1 -Zmne3yzxbrww2ywkEtvrNTVokMsAsJchPXQhI2U0K7t4WaPW4XY5mqRJjox0r26kmqPZm9I4XJui -GMx1I4S+6+JNM3GOGvDC+Mcdoq0Dlyz4zyXG9rgkMbFjXZJ/Y/AlyVMuH79NAgMBAAGjgdIwgc8w -HQYDVR0OBBYEFJWxtPCUtr3H2tERCSG+wa9J/RB7MAsGA1UdDwQEAwIBBjAPBgNVHRMBAf8EBTAD -AQH/MIGPBgNVHSMEgYcwgYSAFJWxtPCUtr3H2tERCSG+wa9J/RB7oWmkZzBlMQswCQYDVQQGEwJT -RTEUMBIGA1UEChMLQWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSEw -HwYDVQQDExhBZGRUcnVzdCBDbGFzcyAxIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBACxt -ZBsfzQ3duQH6lmM0MkhHma6X7f1yFqZzR1r0693p9db7RcwpiURdv0Y5PejuvE1Uhh4dbOMXJ0Ph -iVYrqW9yTkkz43J8KiOavD7/KCrto/8cI7pDVwlnTUtiBi34/2ydYB7YHEt9tTEv2dB8Xfjea4MY -eDdXL+gzB2ffHsdrKpV2ro9Xo/D0UrSpUwjP4E/TelOL/bscVjby/rK25Xa71SJlpz/+0WatC7xr -mYbvP33zGDLKe8bjq2RGlfgmadlVg3sslgf/WSxEo8bl6ancoWOAWiFeIc9TVPC6b4nbqKqVz4vj -ccweGyBECMB6tkD9xOQ14R0WHNC8K47Wcdk= ------END CERTIFICATE----- - AddTrust External Root ====================== -----BEGIN CERTIFICATE----- @@ -178,54 +154,6 @@ e6cJDUCrat2PisP29owaQgVR1EX1n6diIWgVIEM8med8vSTYqZEXc4g/VhsxOBi0cQ+azcgOno4u G+GMmIPLHzHxREzGBHNJdmAPx/i9F4BrLunMTA5amnkPIAou1Z5jJh5VkpTYghdae9C8x49OhgQ= -----END CERTIFICATE----- -AddTrust Public Services Root -============================= ------BEGIN CERTIFICATE----- -MIIEFTCCAv2gAwIBAgIBATANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSAwHgYDVQQDExdBZGRU -cnVzdCBQdWJsaWMgQ0EgUm9vdDAeFw0wMDA1MzAxMDQxNTBaFw0yMDA1MzAxMDQxNTBaMGQxCzAJ -BgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQIE5l -dHdvcmsxIDAeBgNVBAMTF0FkZFRydXN0IFB1YmxpYyBDQSBSb290MIIBIjANBgkqhkiG9w0BAQEF -AAOCAQ8AMIIBCgKCAQEA6Rowj4OIFMEg2Dybjxt+A3S72mnTRqX4jsIMEZBRpS9mVEBV6tsfSlbu -nyNu9DnLoblv8n75XYcmYZ4c+OLspoH4IcUkzBEMP9smcnrHAZcHF/nXGCwwfQ56HmIexkvA/X1i -d9NEHif2P0tEs7c42TkfYNVRknMDtABp4/MUTu7R3AnPdzRGULD4EfL+OHn3Bzn+UZKXC1sIXzSG -Aa2Il+tmzV7R/9x98oTaunet3IAIx6eH1lWfl2royBFkuucZKT8Rs3iQhCBSWxHveNCD9tVIkNAw -HM+A+WD+eeSI8t0A65RF62WUaUC6wNW0uLp9BBGo6zEFlpROWCGOn9Bg/QIDAQABo4HRMIHOMB0G -A1UdDgQWBBSBPjfYkrAfd59ctKtzquf2NGAv+jALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zCBjgYDVR0jBIGGMIGDgBSBPjfYkrAfd59ctKtzquf2NGAv+qFopGYwZDELMAkGA1UEBhMCU0Ux -FDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29yazEgMB4G -A1UEAxMXQWRkVHJ1c3QgUHVibGljIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQADggEBAAP3FUr4 -JNojVhaTdt02KLmuG7jD8WS6IBh4lSknVwW8fCr0uVFV2ocC3g8WFzH4qnkuCRO7r7IgGRLlk/lL -+YPoRNWyQSW/iHVv/xD8SlTQX/D67zZzfRs2RcYhbbQVuE7PnFylPVoAjgbjPGsye/Kf8Lb93/Ao -GEjwxrzQvzSAlsJKsW2Ox5BF3i9nrEUEo3rcVZLJR2bYGozH7ZxOmuASu7VqTITh4SINhwBk/ox9 -Yjllpu9CtoAlEmEBqCQTcAARJl/6NVDFSMwGR+gn2HCNX2TmoUQmXiLsks3/QppEIW1cxeMiHV9H -EufOX1362KqxMy3ZdvJOOjMMK7MtkAY= ------END CERTIFICATE----- - -AddTrust Qualified Certificates Root -==================================== ------BEGIN CERTIFICATE----- -MIIEHjCCAwagAwIBAgIBATANBgkqhkiG9w0BAQUFADBnMQswCQYDVQQGEwJTRTEUMBIGA1UEChML -QWRkVHJ1c3QgQUIxHTAbBgNVBAsTFEFkZFRydXN0IFRUUCBOZXR3b3JrMSMwIQYDVQQDExpBZGRU -cnVzdCBRdWFsaWZpZWQgQ0EgUm9vdDAeFw0wMDA1MzAxMDQ0NTBaFw0yMDA1MzAxMDQ0NTBaMGcx -CzAJBgNVBAYTAlNFMRQwEgYDVQQKEwtBZGRUcnVzdCBBQjEdMBsGA1UECxMUQWRkVHJ1c3QgVFRQ -IE5ldHdvcmsxIzAhBgNVBAMTGkFkZFRydXN0IFF1YWxpZmllZCBDQSBSb290MIIBIjANBgkqhkiG -9w0BAQEFAAOCAQ8AMIIBCgKCAQEA5B6a/twJWoekn0e+EV+vhDTbYjx5eLfpMLXsDBwqxBb/4Oxx -64r1EW7tTw2R0hIYLUkVAcKkIhPHEWT/IhKauY5cLwjPcWqzZwFZ8V1G87B4pfYOQnrjfxvM0PC3 -KP0q6p6zsLkEqv32x7SxuCqg+1jxGaBvcCV+PmlKfw8i2O+tCBGaKZnhqkRFmhJePp1tUvznoD1o -L/BLcHwTOK28FSXx1s6rosAx1i+f4P8UWfyEk9mHfExUE+uf0S0R+Bg6Ot4l2ffTQO2kBhLEO+GR -wVY18BTcZTYJbqukB8c10cIDMzZbdSZtQvESa0NvS3GU+jQd7RNuyoB/mC9suWXY6QIDAQABo4HU -MIHRMB0GA1UdDgQWBBQ5lYtii1zJ1IC6WA+XPxUIQ8yYpzALBgNVHQ8EBAMCAQYwDwYDVR0TAQH/ -BAUwAwEB/zCBkQYDVR0jBIGJMIGGgBQ5lYtii1zJ1IC6WA+XPxUIQ8yYp6FrpGkwZzELMAkGA1UE -BhMCU0UxFDASBgNVBAoTC0FkZFRydXN0IEFCMR0wGwYDVQQLExRBZGRUcnVzdCBUVFAgTmV0d29y -azEjMCEGA1UEAxMaQWRkVHJ1c3QgUXVhbGlmaWVkIENBIFJvb3SCAQEwDQYJKoZIhvcNAQEFBQAD -ggEBABmrder4i2VhlRO6aQTvhsoToMeqT2QbPxj2qC0sVY8FtzDqQmodwCVRLae/DLPt7wh/bDxG -GuoYQ992zPlmhpwsaPXpF/gxsxjE1kh9I0xowX67ARRvxdlu3rsEQmr49lx95dr6h+sNNVJn0J6X -dgWTP5XHAeZpVTh/EGGZyeNfpso+gmNIquIISD6q8rKFYqa0p9m9N5xotS1WfbC3P6CxB9bpT9ze -RXEwMn8bLgn5v1Kh7sKAPgZcLlVAwRv1cEWw3F369nJad9Jjzc9YiQBCYz95OdBEsIJuQRno3eDB -iFrRHnGTHyQwdOUeqN48Jzd/g66ed8/wMLH/S5noxqE= ------END CERTIFICATE----- - Entrust Root Certification Authority ==================================== -----BEGIN CERTIFICATE----- @@ -252,27 +180,6 @@ W3iDVuycNsMm4hH2Z0kdkquM++v/eu6FSqdQgPCnXEqULl8FmTxSQeDNtGPPAUO6nIPcj2A781q0 tHuu2guQOHXvgR1m0vdXcDazv/wor3ElhVsT/h5/WrQ8 -----END CERTIFICATE----- -RSA Security 2048 v3 -==================== ------BEGIN CERTIFICATE----- -MIIDYTCCAkmgAwIBAgIQCgEBAQAAAnwAAAAKAAAAAjANBgkqhkiG9w0BAQUFADA6MRkwFwYDVQQK -ExBSU0EgU2VjdXJpdHkgSW5jMR0wGwYDVQQLExRSU0EgU2VjdXJpdHkgMjA0OCBWMzAeFw0wMTAy -MjIyMDM5MjNaFw0yNjAyMjIyMDM5MjNaMDoxGTAXBgNVBAoTEFJTQSBTZWN1cml0eSBJbmMxHTAb -BgNVBAsTFFJTQSBTZWN1cml0eSAyMDQ4IFYzMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKC -AQEAt49VcdKA3XtpeafwGFAyPGJn9gqVB93mG/Oe2dJBVGutn3y+Gc37RqtBaB4Y6lXIL5F4iSj7 -Jylg/9+PjDvJSZu1pJTOAeo+tWN7fyb9Gd3AIb2E0S1PRsNO3Ng3OTsor8udGuorryGlwSMiuLgb -WhOHV4PR8CDn6E8jQrAApX2J6elhc5SYcSa8LWrg903w8bYqODGBDSnhAMFRD0xS+ARaqn1y07iH -KrtjEAMqs6FPDVpeRrc9DvV07Jmf+T0kgYim3WBU6JU2PcYJk5qjEoAAVZkZR73QpXzDuvsf9/UP -+Ky5tfQ3mBMY3oVbtwyCO4dvlTlYMNpuAWgXIszACwIDAQABo2MwYTAPBgNVHRMBAf8EBTADAQH/ -MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBQHw1EwpKrpRa41JPr/JCwz0LGdjDAdBgNVHQ4E -FgQUB8NRMKSq6UWuNST6/yQsM9CxnYwwDQYJKoZIhvcNAQEFBQADggEBAF8+hnZuuDU8TjYcHnmY -v/3VEhF5Ug7uMYm83X/50cYVIeiKAVQNOvtUudZj1LGqlk2iQk3UUx+LEN5/Zb5gEydxiKRz44Rj -0aRV4VCT5hsOedBnvEbIvz8XDZXmxpBp3ue0L96VfdASPz0+f00/FGj1EVDVwfSQpQgdMWD/YIwj -VAqv/qFuxdF6Kmh4zx6CCiC0H63lhbJqaHVOrSU3lIW+vaHU6rcMSzyd6BIA8F+sDeGscGNz9395 -nzIlQnQFgCi/vcEkllgVsRch6YlL2weIZ/QVrXA+L02FO8K32/6YaCOJ4XQP3vTFhGMpG8zLB8kA -pKnXwiJPZ9d37CAFYd4= ------END CERTIFICATE----- - GeoTrust Global CA ================== -----BEGIN CERTIFICATE----- @@ -294,27 +201,6 @@ XE0zX5IJL4hmXXeXxx12E6nV5fEWCRE11azbJHFwLJhWC9kXtNHjUStedejV0NxPNO3CBWaAocvm Mw== -----END CERTIFICATE----- -GeoTrust Global CA 2 -==================== ------BEGIN CERTIFICATE----- -MIIDZjCCAk6gAwIBAgIBATANBgkqhkiG9w0BAQUFADBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMN -R2VvVHJ1c3QgSW5jLjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwHhcNMDQwMzA0MDUw -MDAwWhcNMTkwMzA0MDUwMDAwWjBEMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNR2VvVHJ1c3QgSW5j -LjEdMBsGA1UEAxMUR2VvVHJ1c3QgR2xvYmFsIENBIDIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAw -ggEKAoIBAQDvPE1APRDfO1MA4Wf+lGAVPoWI8YkNkMgoI5kF6CsgncbzYEbYwbLVjDHZ3CB5JIG/ -NTL8Y2nbsSpr7iFY8gjpeMtvy/wWUsiRxP89c96xPqfCfWbB9X5SJBri1WeR0IIQ13hLTytCOb1k -LUCgsBDTOEhGiKEMuzozKmKY+wCdE1l/bztyqu6mD4b5BWHqZ38MN5aL5mkWRxHCJ1kDs6ZgwiFA -Vvqgx306E+PsV8ez1q6diYD3Aecs9pYrEw15LNnA5IZ7S4wMcoKK+xfNAGw6EzywhIdLFnopsk/b -HdQL82Y3vdj2V7teJHq4PIu5+pIaGoSe2HSPqht/XvT+RSIhAgMBAAGjYzBhMA8GA1UdEwEB/wQF -MAMBAf8wHQYDVR0OBBYEFHE4NvICMVNHK266ZUapEBVYIAUJMB8GA1UdIwQYMBaAFHE4NvICMVNH -K266ZUapEBVYIAUJMA4GA1UdDwEB/wQEAwIBhjANBgkqhkiG9w0BAQUFAAOCAQEAA/e1K6tdEPx7 -srJerJsOflN4WT5CBP51o62sgU7XAotexC3IUnbHLB/8gTKY0UvGkpMzNTEv/NgdRN3ggX+d6Yvh -ZJFiCzkIjKx0nVnZellSlxG5FntvRdOW2TF9AjYPnDtuzywNA0ZF66D0f0hExghAzN4bcLUprbqL -OzRldRtxIR0sFAqwlpW41uryZfspuk/qkZN0abby/+Ea0AzRdoXLiiW9l14sbxWZJue2Kf8i7MkC -x1YAzUm5s2x7UwQa4qjJqhIFI8LO57sEAszAR6LkxCkvW0VXiVHuPOtSCP8HNR6fNWpHSlaY0VqF -H4z1Ir+rzoPz4iIprn2DQKi6bA== ------END CERTIFICATE----- - GeoTrust Universal CA ===================== -----BEGIN CERTIFICATE----- @@ -440,56 +326,6 @@ Rt0vxuBqw8M0Ayx9lt1awg6nCpnBBYurDC/zXDrPbDdVCYfeU0BsWO/8tqtlbgT2G9w84FoVxp7Z 12yxow+ev+to51byrvLjKzg6CYG1a4XXvi3tPxq3smPi9WIsgtRqAEFQ8TmDn5XpNpaYbg== -----END CERTIFICATE----- -Comodo Secure Services root -=========================== ------BEGIN CERTIFICATE----- -MIIEPzCCAyegAwIBAgIBATANBgkqhkiG9w0BAQUFADB+MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS -R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg -TGltaXRlZDEkMCIGA1UEAwwbU2VjdXJlIENlcnRpZmljYXRlIFNlcnZpY2VzMB4XDTA0MDEwMTAw -MDAwMFoXDTI4MTIzMTIzNTk1OVowfjELMAkGA1UEBhMCR0IxGzAZBgNVBAgMEkdyZWF0ZXIgTWFu -Y2hlc3RlcjEQMA4GA1UEBwwHU2FsZm9yZDEaMBgGA1UECgwRQ29tb2RvIENBIExpbWl0ZWQxJDAi -BgNVBAMMG1NlY3VyZSBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczCCASIwDQYJKoZIhvcNAQEBBQADggEP -ADCCAQoCggEBAMBxM4KK0HDrc4eCQNUd5MvJDkKQ+d40uaG6EfQlhfPMcm3ye5drswfxdySRXyWP -9nQ95IDC+DwN879A6vfIUtFyb+/Iq0G4bi4XKpVpDM3SHpR7LZQdqnXXs5jLrLxkU0C8j6ysNstc -rbvd4JQX7NFc0L/vpZXJkMWwrPsbQ996CF23uPJAGysnnlDOXmWCiIxe004MeuoIkbY2qitC++rC -oznl2yY4rYsK7hljxxwk3wN42ubqwUcaCwtGCd0C/N7Lh1/XMGNooa7cMqG6vv5Eq2i2pRcV/b3V -p6ea5EQz6YiO/O1R65NxTq0B50SOqy3LqP4BSUjwwN3HaNiS/j0CAwEAAaOBxzCBxDAdBgNVHQ4E -FgQUPNiTiMLAggnMAZkGkyDpnnAJY08wDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8w -gYEGA1UdHwR6MHgwO6A5oDeGNWh0dHA6Ly9jcmwuY29tb2RvY2EuY29tL1NlY3VyZUNlcnRpZmlj -YXRlU2VydmljZXMuY3JsMDmgN6A1hjNodHRwOi8vY3JsLmNvbW9kby5uZXQvU2VjdXJlQ2VydGlm -aWNhdGVTZXJ2aWNlcy5jcmwwDQYJKoZIhvcNAQEFBQADggEBAIcBbSMdflsXfcFhMs+P5/OKlFlm -4J4oqF7Tt/Q05qo5spcWxYJvMqTpjOev/e/C6LlLqqP05tqNZSH7uoDrJiiFGv45jN5bBAS0VPmj -Z55B+glSzAVIqMk/IQQezkhr/IXownuvf7fM+F86/TXGDe+X3EyrEeFryzHRbPtIgKvcnDe4IRRL -DXE97IMzbtFuMhbsmMcWi1mmNKsFVy2T96oTy9IT4rcuO81rUBcJaD61JlfutuC23bkpgHl9j6Pw -pCikFcSF9CfUa7/lXORlAnZUtOM3ZiTTGWHIUhDlizeauan5Hb/qmZJhlv8BzaFfDbxxvA6sCx1H -RR3B7Hzs/Sk= ------END CERTIFICATE----- - -Comodo Trusted Services root -============================ ------BEGIN CERTIFICATE----- -MIIEQzCCAyugAwIBAgIBATANBgkqhkiG9w0BAQUFADB/MQswCQYDVQQGEwJHQjEbMBkGA1UECAwS -R3JlYXRlciBNYW5jaGVzdGVyMRAwDgYDVQQHDAdTYWxmb3JkMRowGAYDVQQKDBFDb21vZG8gQ0Eg -TGltaXRlZDElMCMGA1UEAwwcVHJ1c3RlZCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczAeFw0wNDAxMDEw -MDAwMDBaFw0yODEyMzEyMzU5NTlaMH8xCzAJBgNVBAYTAkdCMRswGQYDVQQIDBJHcmVhdGVyIE1h -bmNoZXN0ZXIxEDAOBgNVBAcMB1NhbGZvcmQxGjAYBgNVBAoMEUNvbW9kbyBDQSBMaW1pdGVkMSUw -IwYDVQQDDBxUcnVzdGVkIENlcnRpZmljYXRlIFNlcnZpY2VzMIIBIjANBgkqhkiG9w0BAQEFAAOC -AQ8AMIIBCgKCAQEA33FvNlhTWvI2VFeAxHQIIO0Yfyod5jWaHiWsnOWWfnJSoBVC21ndZHoa0Lh7 -3TkVvFVIxO06AOoxEbrycXQaZ7jPM8yoMa+j49d/vzMtTGo87IvDktJTdyR0nAducPy9C1t2ul/y -/9c3S0pgePfw+spwtOpZqqPOSC+pw7ILfhdyFgymBwwbOM/JYrc/oJOlh0Hyt3BAd9i+FHzjqMB6 -juljatEPmsbS9Is6FARW1O24zG71++IsWL1/T2sr92AkWCTOJu80kTrV44HQsvAEAtdbtz6SrGsS -ivnkBbA7kUlcsutT6vifR4buv5XAwAaf0lteERv0xwQ1KdJVXOTt6wIDAQABo4HJMIHGMB0GA1Ud -DgQWBBTFe1i97doladL3WRaoszLAeydb9DAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB -/zCBgwYDVR0fBHwwejA8oDqgOIY2aHR0cDovL2NybC5jb21vZG9jYS5jb20vVHJ1c3RlZENlcnRp -ZmljYXRlU2VydmljZXMuY3JsMDqgOKA2hjRodHRwOi8vY3JsLmNvbW9kby5uZXQvVHJ1c3RlZENl -cnRpZmljYXRlU2VydmljZXMuY3JsMA0GCSqGSIb3DQEBBQUAA4IBAQDIk4E7ibSvuIQSTI3S8Ntw -uleGFTQQuS9/HrCoiWChisJ3DFBKmwCL2Iv0QeLQg4pKHBQGsKNoBXAxMKdTmw7pSqBYaWcOrp32 -pSxBvzwGa+RZzG0Q8ZZvH9/0BAKkn0U+yNj6NkZEUD+Cl5EfKNsYEYwq5GWDVxISjBc/lDb+XbDA -BHcTuPQV1T84zJQ6VdCsmPW6AF/ghhmBeC8owH7TzEIK9a5QoNE+xqFx7D+gIIxmOom0jtTYsU0l -R+4viMi14QVFwL4Ucd56/Y57fU0IlqUSc/AtyjcndBInTMu2l+nZrghtWjlA3QVHdWpaIbOjGM9O -9y5Xt5hwXsjEeLBi ------END CERTIFICATE----- - QuoVadis Root CA ================ -----BEGIN CERTIFICATE----- @@ -629,54 +465,6 @@ EtzKO6gunRRaBXW37Ndj4ro1tgQIkejanZz2ZrUYrAqmVCY0M9IbwdR/GjqOC6oybtv8TyWf2TLH llpwrN9M -----END CERTIFICATE----- -Staat der Nederlanden Root CA -============================= ------BEGIN CERTIFICATE----- -MIIDujCCAqKgAwIBAgIEAJiWijANBgkqhkiG9w0BAQUFADBVMQswCQYDVQQGEwJOTDEeMBwGA1UE -ChMVU3RhYXQgZGVyIE5lZGVybGFuZGVuMSYwJAYDVQQDEx1TdGFhdCBkZXIgTmVkZXJsYW5kZW4g -Um9vdCBDQTAeFw0wMjEyMTcwOTIzNDlaFw0xNTEyMTYwOTE1MzhaMFUxCzAJBgNVBAYTAk5MMR4w -HAYDVQQKExVTdGFhdCBkZXIgTmVkZXJsYW5kZW4xJjAkBgNVBAMTHVN0YWF0IGRlciBOZWRlcmxh -bmRlbiBSb290IENBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAmNK1URF6gaYUmHFt -vsznExvWJw56s2oYHLZhWtVhCb/ekBPHZ+7d89rFDBKeNVU+LCeIQGv33N0iYfXCxw719tV2U02P -jLwYdjeFnejKScfST5gTCaI+Ioicf9byEGW07l8Y1Rfj+MX94p2i71MOhXeiD+EwR+4A5zN9RGca -C1Hoi6CeUJhoNFIfLm0B8mBF8jHrqTFoKbt6QZ7GGX+UtFE5A3+y3qcym7RHjm+0Sq7lr7HcsBth -vJly3uSJt3omXdozSVtSnA71iq3DuD3oBmrC1SoLbHuEvVYFy4ZlkuxEK7COudxwC0barbxjiDn6 -22r+I/q85Ej0ZytqERAhSQIDAQABo4GRMIGOMAwGA1UdEwQFMAMBAf8wTwYDVR0gBEgwRjBEBgRV -HSAAMDwwOgYIKwYBBQUHAgEWLmh0dHA6Ly93d3cucGtpb3ZlcmhlaWQubmwvcG9saWNpZXMvcm9v -dC1wb2xpY3kwDgYDVR0PAQH/BAQDAgEGMB0GA1UdDgQWBBSofeu8Y6R0E3QA7Jbg0zTBLL9s+DAN -BgkqhkiG9w0BAQUFAAOCAQEABYSHVXQ2YcG70dTGFagTtJ+k/rvuFbQvBgwp8qiSpGEN/KtcCFtR -EytNwiphyPgJWPwtArI5fZlmgb9uXJVFIGzmeafR2Bwp/MIgJ1HI8XxdNGdphREwxgDS1/PTfLbw -MVcoEoJz6TMvplW0C5GUR5z6u3pCMuiufi3IvKwUv9kP2Vv8wfl6leF9fpb8cbDCTMjfRTTJzg3y -nGQI0DvDKcWy7ZAEwbEpkcUwb8GpcjPM/l0WFywRaed+/sWDCN+83CI6LiBpIzlWYGeQiy52OfsR -iJf2fL1LuCAWZwWN4jvBcj+UlTfHXbme2JOhF4//DGYVwSR8MnwDHTuhWEUykw== ------END CERTIFICATE----- - -UTN USERFirst Hardware Root CA -============================== ------BEGIN CERTIFICATE----- -MIIEdDCCA1ygAwIBAgIQRL4Mi1AAJLQR0zYq/mUK/TANBgkqhkiG9w0BAQUFADCBlzELMAkGA1UE -BhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0eTEeMBwGA1UEChMVVGhl -IFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVzZXJ0cnVzdC5jb20xHzAd -BgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwHhcNOTkwNzA5MTgxMDQyWhcNMTkwNzA5MTgx -OTIyWjCBlzELMAkGA1UEBhMCVVMxCzAJBgNVBAgTAlVUMRcwFQYDVQQHEw5TYWx0IExha2UgQ2l0 -eTEeMBwGA1UEChMVVGhlIFVTRVJUUlVTVCBOZXR3b3JrMSEwHwYDVQQLExhodHRwOi8vd3d3LnVz -ZXJ0cnVzdC5jb20xHzAdBgNVBAMTFlVUTi1VU0VSRmlyc3QtSGFyZHdhcmUwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCx98M4P7Sof885glFn0G2f0v9Y8+efK+wNiVSZuTiZFvfgIXlI -wrthdBKWHTxqctU8EGc6Oe0rE81m65UJM6Rsl7HoxuzBdXmcRl6Nq9Bq/bkqVRcQVLMZ8Jr28bFd -tqdt++BxF2uiiPsA3/4aMXcMmgF6sTLjKwEHOG7DpV4jvEWbe1DByTCP2+UretNb+zNAHqDVmBe8 -i4fDidNdoI6yqqr2jmmIBsX6iSHzCJ1pLgkzmykNRg+MzEk0sGlRvfkGzWitZky8PqxhvQqIDsjf -Pe58BEydCl5rkdbux+0ojatNh4lz0G6k0B4WixThdkQDf2Os5M1JnMWS9KsyoUhbAgMBAAGjgbkw -gbYwCwYDVR0PBAQDAgHGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFKFyXyYbKJhDlV0HN9WF -lp1L0sNFMEQGA1UdHwQ9MDswOaA3oDWGM2h0dHA6Ly9jcmwudXNlcnRydXN0LmNvbS9VVE4tVVNF -UkZpcnN0LUhhcmR3YXJlLmNybDAxBgNVHSUEKjAoBggrBgEFBQcDAQYIKwYBBQUHAwUGCCsGAQUF -BwMGBggrBgEFBQcDBzANBgkqhkiG9w0BAQUFAAOCAQEARxkP3nTGmZev/K0oXnWO6y1n7k57K9cM -//bey1WiCuFMVGWTYGufEpytXoMs61quwOQt9ABjHbjAbPLPSbtNk28GpgoiskliCE7/yMgUsogW -XecB5BKV5UU0s4tpvc+0hY91UZ59Ojg6FEgSxvunOxqNDYJAB+gECJChicsZUN/KHAG8HQQZexB2 -lzvukJDKxA4fFm517zP4029bHpbj4HR3dHuKom4t3XbWOTCC8KucUvIqx69JXn7HaOWCgchqJ/kn -iCrVWFCVH/A7HFe7fRQ5YiuayZSSKqMiDP+JJn1fIytH1xUdqWqeUQ0qUZ6B+dQ7XnASfxAynB67 -nfhmqA== ------END CERTIFICATE----- - Camerfirma Chambers of Commerce Root ==================================== -----BEGIN CERTIFICATE----- @@ -731,41 +519,6 @@ IBHNfTIzSJRUTN3cecQwn+uOuFW114hcxWokPbLTBQNRxgfvzBRydD1ucs4YKIxKoHflCStFREes t2d/AYoFWpO+ocH/+OcOZ6RHSXZddZAa9SaP8A== -----END CERTIFICATE----- -NetLock Notary (Class A) Root -============================= ------BEGIN CERTIFICATE----- -MIIGfTCCBWWgAwIBAgICAQMwDQYJKoZIhvcNAQEEBQAwga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQI -EwdIdW5nYXJ5MREwDwYDVQQHEwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6 -dG9uc2FnaSBLZnQuMRowGAYDVQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9j -ayBLb3pqZWd5em9pIChDbGFzcyBBKSBUYW51c2l0dmFueWtpYWRvMB4XDTk5MDIyNDIzMTQ0N1oX -DTE5MDIxOTIzMTQ0N1owga8xCzAJBgNVBAYTAkhVMRAwDgYDVQQIEwdIdW5nYXJ5MREwDwYDVQQH -EwhCdWRhcGVzdDEnMCUGA1UEChMeTmV0TG9jayBIYWxvemF0Yml6dG9uc2FnaSBLZnQuMRowGAYD -VQQLExFUYW51c2l0dmFueWtpYWRvazE2MDQGA1UEAxMtTmV0TG9jayBLb3pqZWd5em9pIChDbGFz -cyBBKSBUYW51c2l0dmFueWtpYWRvMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAvHSM -D7tM9DceqQWC2ObhbHDqeLVu0ThEDaiDzl3S1tWBxdRL51uUcCbbO51qTGL3cfNk1mE7PetzozfZ -z+qMkjvN9wfcZnSX9EUi3fRc4L9t875lM+QVOr/bmJBVOMTtplVjC7B4BPTjbsE/jvxReB+SnoPC -/tmwqcm8WgD/qaiYdPv2LD4VOQ22BFWoDpggQrOxJa1+mm9dU7GrDPzr4PN6s6iz/0b2Y6LYOph7 -tqyF/7AlT3Rj5xMHpQqPBffAZG9+pyeAlt7ULoZgx2srXnN7F+eRP2QM2EsiNCubMvJIH5+hCoR6 -4sKtlz2O1cH5VqNQ6ca0+pii7pXmKgOM3wIDAQABo4ICnzCCApswDgYDVR0PAQH/BAQDAgAGMBIG -A1UdEwEB/wQIMAYBAf8CAQQwEQYJYIZIAYb4QgEBBAQDAgAHMIICYAYJYIZIAYb4QgENBIICURaC -Ak1GSUdZRUxFTSEgRXplbiB0YW51c2l0dmFueSBhIE5ldExvY2sgS2Z0LiBBbHRhbGFub3MgU3pv -bGdhbHRhdGFzaSBGZWx0ZXRlbGVpYmVuIGxlaXJ0IGVsamFyYXNvayBhbGFwamFuIGtlc3p1bHQu -IEEgaGl0ZWxlc2l0ZXMgZm9seWFtYXRhdCBhIE5ldExvY2sgS2Z0LiB0ZXJtZWtmZWxlbG9zc2Vn -LWJpenRvc2l0YXNhIHZlZGkuIEEgZGlnaXRhbGlzIGFsYWlyYXMgZWxmb2dhZGFzYW5hayBmZWx0 -ZXRlbGUgYXogZWxvaXJ0IGVsbGVub3J6ZXNpIGVsamFyYXMgbWVndGV0ZWxlLiBBeiBlbGphcmFz -IGxlaXJhc2EgbWVndGFsYWxoYXRvIGEgTmV0TG9jayBLZnQuIEludGVybmV0IGhvbmxhcGphbiBh -IGh0dHBzOi8vd3d3Lm5ldGxvY2submV0L2RvY3MgY2ltZW4gdmFneSBrZXJoZXRvIGF6IGVsbGVu -b3J6ZXNAbmV0bG9jay5uZXQgZS1tYWlsIGNpbWVuLiBJTVBPUlRBTlQhIFRoZSBpc3N1YW5jZSBh -bmQgdGhlIHVzZSBvZiB0aGlzIGNlcnRpZmljYXRlIGlzIHN1YmplY3QgdG8gdGhlIE5ldExvY2sg -Q1BTIGF2YWlsYWJsZSBhdCBodHRwczovL3d3dy5uZXRsb2NrLm5ldC9kb2NzIG9yIGJ5IGUtbWFp -bCBhdCBjcHNAbmV0bG9jay5uZXQuMA0GCSqGSIb3DQEBBAUAA4IBAQBIJEb3ulZv+sgoA0BO5TE5 -ayZrU3/b39/zcT0mwBQOxmd7I6gMc90Bu8bKbjc5VdXHjFYgDigKDtIqpLBJUsY4B/6+CgmM0ZjP -ytoUMaFP0jn8DxEsQ8Pdq5PHVT5HfBgaANzze9jyf1JsIPQLX2lS9O74silg6+NJMSEN1rUQQeJB -CWziGppWS3cC9qCbmieH6FUpccKQn0V4GuEVZD3QDtigdp+uxdAu6tYPVuxkf1qbFFgBJ34TUMdr -KuZoPL9coAob4Q566eKAw+np9v1sEZ7Q5SgnK1QyQhSCdeZK8CtmdWOMovsEPoMOmzbwGOQmIMOM -8CgHrTwXZoi1/baI ------END CERTIFICATE----- - XRamp Global CA Root ==================== -----BEGIN CERTIFICATE----- @@ -909,38 +662,6 @@ CZBUkQM8R+XVyWXgt0t97EfTsws+rZ7QdAAO671RrcDeLMDDav7v3Aun+kbfYNucpllQdSNpc5Oy +fwC00fmcc4QAu4njIT/rEUNE1yDMuAlpYYsfPQS -----END CERTIFICATE----- -Swisscom Root CA 1 -================== ------BEGIN CERTIFICATE----- -MIIF2TCCA8GgAwIBAgIQXAuFXAvnWUHfV8w/f52oNjANBgkqhkiG9w0BAQUFADBkMQswCQYDVQQG -EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy -dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMTAeFw0wNTA4MTgxMjA2MjBaFw0yNTA4 -MTgyMjA2MjBaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln -aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAxMIIC -IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEA0LmwqAzZuz8h+BvVM5OAFmUgdbI9m2BtRsiM -MW8Xw/qabFbtPMWRV8PNq5ZJkCoZSx6jbVfd8StiKHVFXqrWW/oLJdihFvkcxC7mlSpnzNApbjyF -NDhhSbEAn9Y6cV9Nbc5fuankiX9qUvrKm/LcqfmdmUc/TilftKaNXXsLmREDA/7n29uj/x2lzZAe -AR81sH8A25Bvxn570e56eqeqDFdvpG3FEzuwpdntMhy0XmeLVNxzh+XTF3xmUHJd1BpYwdnP2IkC -b6dJtDZd0KTeByy2dbcokdaXvij1mB7qWybJvbCXc9qukSbraMH5ORXWZ0sKbU/Lz7DkQnGMU3nn -7uHbHaBuHYwadzVcFh4rUx80i9Fs/PJnB3r1re3WmquhsUvhzDdf/X/NTa64H5xD+SpYVUNFvJbN -cA78yeNmuk6NO4HLFWR7uZToXTNShXEuT46iBhFRyePLoW4xCGQMwtI89Tbo19AOeCMgkckkKmUp -WyL3Ic6DXqTz3kvTaI9GdVyDCW4pa8RwjPWd1yAv/0bSKzjCL3UcPX7ape8eYIVpQtPM+GP+HkM5 -haa2Y0EQs3MevNP6yn0WR+Kn1dCjigoIlmJWbjTb2QK5MHXjBNLnj8KwEUAKrNVxAmKLMb7dxiNY -MUJDLXT5xp6mig/p/r+D5kNXJLrvRjSq1xIBOO0CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw -HQYDVR0hBBYwFDASBgdghXQBUwABBgdghXQBUwABMBIGA1UdEwEB/wQIMAYBAf8CAQcwHwYDVR0j -BBgwFoAUAyUv3m+CATpcLNwroWm1Z9SM0/0wHQYDVR0OBBYEFAMlL95vggE6XCzcK6FptWfUjNP9 -MA0GCSqGSIb3DQEBBQUAA4ICAQA1EMvspgQNDQ/NwNurqPKIlwzfky9NfEBWMXrrpA9gzXrzvsMn -jgM+pN0S734edAY8PzHyHHuRMSG08NBsl9Tpl7IkVh5WwzW9iAUPWxAaZOHHgjD5Mq2eUCzneAXQ -MbFamIp1TpBcahQq4FJHgmDmHtqBsfsUC1rxn9KVuj7QG9YVHaO+htXbD8BJZLsuUBlL0iT43R4H -VtA4oJVwIHaM190e3p9xxCPvgxNcoyQVTSlAPGrEqdi3pkSlDfTgnXceQHAm/NrZNuR55LU/vJtl -vrsRls/bxig5OgjOR1tTWsWZ/l2p3e9M1MalrQLmjAcSHm8D0W+go/MpvRLHUKKwf4ipmXeascCl -OS5cfGniLLDqN2qk4Vrh9VDlg++luyqI54zb/W1elxmofmZ1a3Hqv7HHb6D0jqTsNFFbjCYDcKF3 -1QESVwA12yPeDooomf2xEG9L/zgtYE4snOtnta1J7ksfrK/7DZBaZmBwXarNeNQk7shBoJMBkpxq -nvy5JMWzFYJ+vq6VK+uxwNrjAWALXmmshFZhvnEX/h0TD/7Gh0Xp/jKgGg0TpJRVcaUWi7rKibCy -x/yP2FS1k2Kdzs9Z+z0YzirLNRWCXf9UIltxUvu3yf5gmwBBZPCqKuy2QkPOiWaByIufOVQDJdMW -NY6E0F/6MBr1mmz0DlP5OlvRHA== ------END CERTIFICATE----- - DigiCert Assured ID Root CA =========================== -----BEGIN CERTIFICATE----- @@ -1298,33 +1019,6 @@ wKeI8lN3s2Berq4o2jUsbzRF0ybh3uxbTydrFny9RAQYgrOJeRcQcT16ohZO9QHNpGxlaKFJdlxD ydi8NmdspZS11My5vWo1ViHe2MPr+8ukYEywVaCge1ey -----END CERTIFICATE----- -WellsSecure Public Root Certificate Authority -============================================= ------BEGIN CERTIFICATE----- -MIIEvTCCA6WgAwIBAgIBATANBgkqhkiG9w0BAQUFADCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoM -F1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYw -NAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwHhcN -MDcxMjEzMTcwNzU0WhcNMjIxMjE0MDAwNzU0WjCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dl -bGxzIEZhcmdvIFdlbGxzU2VjdXJlMRwwGgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYD -VQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMgUm9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHkwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDub7S9eeKPCCGeOARBJe+rWxxTkqxtnt3CxC5FlAM1 -iGd0V+PfjLindo8796jE2yljDpFoNoqXjopxaAkH5OjUDk/41itMpBb570OYj7OeUt9tkTmPOL13 -i0Nj67eT/DBMHAGTthP796EfvyXhdDcsHqRePGj4S78NuR4uNuip5Kf4D8uCdXw1LSLWwr8L87T8 -bJVhHlfXBIEyg1J55oNjz7fLY4sR4r1e6/aN7ZVyKLSsEmLpSjPmgzKuBXWVvYSV2ypcm44uDLiB -K0HmOFafSZtsdvqKXfcBeYF8wYNABf5x/Qw/zE5gCQ5lRxAvAcAFP4/4s0HvWkJ+We/SlwxlAgMB -AAGjggE0MIIBMDAPBgNVHRMBAf8EBTADAQH/MDkGA1UdHwQyMDAwLqAsoCqGKGh0dHA6Ly9jcmwu -cGtpLndlbGxzZmFyZ28uY29tL3dzcHJjYS5jcmwwDgYDVR0PAQH/BAQDAgHGMB0GA1UdDgQWBBQm -lRkQ2eihl5H/3BnZtQQ+0nMKajCBsgYDVR0jBIGqMIGngBQmlRkQ2eihl5H/3BnZtQQ+0nMKaqGB -i6SBiDCBhTELMAkGA1UEBhMCVVMxIDAeBgNVBAoMF1dlbGxzIEZhcmdvIFdlbGxzU2VjdXJlMRww -GgYDVQQLDBNXZWxscyBGYXJnbyBCYW5rIE5BMTYwNAYDVQQDDC1XZWxsc1NlY3VyZSBQdWJsaWMg -Um9vdCBDZXJ0aWZpY2F0ZSBBdXRob3JpdHmCAQEwDQYJKoZIhvcNAQEFBQADggEBALkVsUSRzCPI -K0134/iaeycNzXK7mQDKfGYZUMbVmO2rvwNa5U3lHshPcZeG1eMd/ZDJPHV3V3p9+N701NX3leZ0 -bh08rnyd2wIDBSxxSyU+B+NemvVmFymIGjifz6pBA4SXa5M4esowRBskRDPQ5NHcKDj0E0M1NSlj -qHyita04pO2t/caaH/+Xc/77szWnk4bGdpEA5qxRFsQnMlzbc9qlk1eOPm01JghZ1edE13YgY+es -E2fDbbFwRnzVlhE9iW9dqKHrjQrawx0zbKPqZxmamX9LPYNRKh3KL4YMon4QLSvUFpULB6ouFJJJ -tylv2G0xffX8oRAHh84vWdw+WNs= ------END CERTIFICATE----- - COMODO ECC Certification Authority ================================== -----BEGIN CERTIFICATE----- @@ -1342,30 +1036,6 @@ FAkK+qDmfQjGGoe9GKhzvSbKYAydzpmfz1wPMOG+FDHqAjAU9JM8SaczepBGR7NjfRObTrdvGDeA U/7dIOA1mjbRxwG55tzd8/8dLDoWV9mSOdY= -----END CERTIFICATE----- -IGC/A -===== ------BEGIN CERTIFICATE----- -MIIEAjCCAuqgAwIBAgIFORFFEJQwDQYJKoZIhvcNAQEFBQAwgYUxCzAJBgNVBAYTAkZSMQ8wDQYD -VQQIEwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVE -Q1NTSTEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZy -MB4XDTAyMTIxMzE0MjkyM1oXDTIwMTAxNzE0MjkyMlowgYUxCzAJBgNVBAYTAkZSMQ8wDQYDVQQI -EwZGcmFuY2UxDjAMBgNVBAcTBVBhcmlzMRAwDgYDVQQKEwdQTS9TR0ROMQ4wDAYDVQQLEwVEQ1NT -STEOMAwGA1UEAxMFSUdDL0ExIzAhBgkqhkiG9w0BCQEWFGlnY2FAc2dkbi5wbS5nb3V2LmZyMIIB -IjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAsh/R0GLFMzvABIaIs9z4iPf930Pfeo2aSVz2 -TqrMHLmh6yeJ8kbpO0px1R2OLc/mratjUMdUC24SyZA2xtgv2pGqaMVy/hcKshd+ebUyiHDKcMCW -So7kVc0dJ5S/znIq7Fz5cyD+vfcuiWe4u0dzEvfRNWk68gq5rv9GQkaiv6GFGvm/5P9JhfejcIYy -HF2fYPepraX/z9E0+X1bF8bc1g4oa8Ld8fUzaJ1O/Id8NhLWo4DoQw1VYZTqZDdH6nfK0LJYBcNd -frGoRpAxVs5wKpayMLh35nnAvSk7/ZR3TL0gzUEl4C7HG7vupARB0l2tEmqKm0f7yd1GQOGdPDPQ -tQIDAQABo3cwdTAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIBRjAVBgNVHSAEDjAMMAoGCCqB -egF5AQEBMB0GA1UdDgQWBBSjBS8YYFDCiQrdKyFP/45OqDAxNjAfBgNVHSMEGDAWgBSjBS8YYFDC -iQrdKyFP/45OqDAxNjANBgkqhkiG9w0BAQUFAAOCAQEABdwm2Pp3FURo/C9mOnTgXeQp/wYHE4RK -q89toB9RlPhJy3Q2FLwV3duJL92PoF189RLrn544pEfMs5bZvpwlqwN+Mw+VgQ39FuCIvjfwbF3Q -MZsyK10XZZOYYLxuj7GoPB7ZHPOpJkL5ZB3C55L29B5aqhlSXa/oovdgoPaN8In1buAKBQGVyYsg -Crpa/JosPL3Dt8ldeCUFP1YUmwza+zpI/pdpXsoQhvdOlgQITeywvl3cO45Pwf2aNjSaTFR+FwNI -lQgRHAdvhQh+XU3Endv7rs6y0bO4g2wdsrN58dhwmX7wEwLOXt1R0982gaEbeC9xs/FZTEYYKKuF -0mBWWg== ------END CERTIFICATE----- - Security Communication EV RootCA1 ================================= -----BEGIN CERTIFICATE----- @@ -1410,46 +1080,6 @@ hNVQA7bihKOmNqoROgHhGEvWRGizPflTdISzRpFGlgC3gCy24eMQ4tui5yiPAZZiFj4A4xylNoEY okxSdsARo27mHbrjWr42U8U+dY+GaSlYU7Wcu2+fXMUY7N0v4ZjJ/L7fCg0= -----END CERTIFICATE----- -Microsec e-Szigno Root CA -========================= ------BEGIN CERTIFICATE----- -MIIHqDCCBpCgAwIBAgIRAMy4579OKRr9otxmpRwsDxEwDQYJKoZIhvcNAQEFBQAwcjELMAkGA1UE -BhMCSFUxETAPBgNVBAcTCEJ1ZGFwZXN0MRYwFAYDVQQKEw1NaWNyb3NlYyBMdGQuMRQwEgYDVQQL -EwtlLVN6aWdubyBDQTEiMCAGA1UEAxMZTWljcm9zZWMgZS1Temlnbm8gUm9vdCBDQTAeFw0wNTA0 -MDYxMjI4NDRaFw0xNzA0MDYxMjI4NDRaMHIxCzAJBgNVBAYTAkhVMREwDwYDVQQHEwhCdWRhcGVz -dDEWMBQGA1UEChMNTWljcm9zZWMgTHRkLjEUMBIGA1UECxMLZS1Temlnbm8gQ0ExIjAgBgNVBAMT -GU1pY3Jvc2VjIGUtU3ppZ25vIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIB -AQDtyADVgXvNOABHzNuEwSFpLHSQDCHZU4ftPkNEU6+r+ICbPHiN1I2uuO/TEdyB5s87lozWbxXG -d36hL+BfkrYn13aaHUM86tnsL+4582pnS4uCzyL4ZVX+LMsvfUh6PXX5qqAnu3jCBspRwn5mS6/N -oqdNAoI/gqyFxuEPkEeZlApxcpMqyabAvjxWTHOSJ/FrtfX9/DAFYJLG65Z+AZHCabEeHXtTRbjc -QR/Ji3HWVBTji1R4P770Yjtb9aPs1ZJ04nQw7wHb4dSrmZsqa/i9phyGI0Jf7Enemotb9HI6QMVJ -PqW+jqpx62z69Rrkav17fVVA71hu5tnVvCSrwe+3AgMBAAGjggQ3MIIEMzBnBggrBgEFBQcBAQRb -MFkwKAYIKwYBBQUHMAGGHGh0dHBzOi8vcmNhLmUtc3ppZ25vLmh1L29jc3AwLQYIKwYBBQUHMAKG -IWh0dHA6Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNydDAPBgNVHRMBAf8EBTADAQH/MIIBcwYD -VR0gBIIBajCCAWYwggFiBgwrBgEEAYGoGAIBAQEwggFQMCgGCCsGAQUFBwIBFhxodHRwOi8vd3d3 -LmUtc3ppZ25vLmh1L1NaU1ovMIIBIgYIKwYBBQUHAgIwggEUHoIBEABBACAAdABhAG4A+gBzAO0A -dAB2AOEAbgB5ACAA6QByAHQAZQBsAG0AZQB6AOkAcwDpAGgAZQB6ACAA6QBzACAAZQBsAGYAbwBn -AGEAZADhAHMA4QBoAG8AegAgAGEAIABTAHoAbwBsAGcA4QBsAHQAYQB0APMAIABTAHoAbwBsAGcA -4QBsAHQAYQB0AOEAcwBpACAAUwB6AGEAYgDhAGwAeQB6AGEAdABhACAAcwB6AGUAcgBpAG4AdAAg -AGsAZQBsAGwAIABlAGwAagDhAHIAbgBpADoAIABoAHQAdABwADoALwAvAHcAdwB3AC4AZQAtAHMA -egBpAGcAbgBvAC4AaAB1AC8AUwBaAFMAWgAvMIHIBgNVHR8EgcAwgb0wgbqggbeggbSGIWh0dHA6 -Ly93d3cuZS1zemlnbm8uaHUvUm9vdENBLmNybIaBjmxkYXA6Ly9sZGFwLmUtc3ppZ25vLmh1L0NO -PU1pY3Jvc2VjJTIwZS1Temlnbm8lMjBSb290JTIwQ0EsT1U9ZS1Temlnbm8lMjBDQSxPPU1pY3Jv -c2VjJTIwTHRkLixMPUJ1ZGFwZXN0LEM9SFU/Y2VydGlmaWNhdGVSZXZvY2F0aW9uTGlzdDtiaW5h -cnkwDgYDVR0PAQH/BAQDAgEGMIGWBgNVHREEgY4wgYuBEGluZm9AZS1zemlnbm8uaHWkdzB1MSMw -IQYDVQQDDBpNaWNyb3NlYyBlLVN6aWduw7MgUm9vdCBDQTEWMBQGA1UECwwNZS1TemlnbsOzIEhT -WjEWMBQGA1UEChMNTWljcm9zZWMgS2Z0LjERMA8GA1UEBxMIQnVkYXBlc3QxCzAJBgNVBAYTAkhV -MIGsBgNVHSMEgaQwgaGAFMegSXUWYYTbMUuE0vE3QJDvTtz3oXakdDByMQswCQYDVQQGEwJIVTER -MA8GA1UEBxMIQnVkYXBlc3QxFjAUBgNVBAoTDU1pY3Jvc2VjIEx0ZC4xFDASBgNVBAsTC2UtU3pp -Z25vIENBMSIwIAYDVQQDExlNaWNyb3NlYyBlLVN6aWdubyBSb290IENBghEAzLjnv04pGv2i3Gal -HCwPETAdBgNVHQ4EFgQUx6BJdRZhhNsxS4TS8TdAkO9O3PcwDQYJKoZIhvcNAQEFBQADggEBANMT -nGZjWS7KXHAM/IO8VbH0jgdsZifOwTsgqRy7RlRw7lrMoHfqaEQn6/Ip3Xep1fvj1KcExJW4C+FE -aGAHQzAxQmHl7tnlJNUb3+FKG6qfx1/4ehHqE5MAyopYse7tDk2016g2JnzgOsHVV4Lxdbb9iV/a -86g4nzUGCM4ilb7N1fy+W955a9x6qWVmvrElWl/tftOsRm1M9DKHtCAE4Gx4sHfRhUZLphK3dehK -yVZs15KrnfVJONJPU+NVkBHbmJbGSfI+9J8b4PeI3CVimUTYc78/MPMMNz7UwiiAc7EBt51alhQB -S6kRnSlqLtBdgcDPsiBDxwPgN05dCtxZICU= ------END CERTIFICATE----- - Certigna ======== -----BEGIN CERTIFICATE----- @@ -1575,58 +1205,6 @@ LBOhgLJeDEoTniDYYkCrkOpkSi+sDQESeUWoL4cZaMjihccwsnX5OD+ywJO0a+IDRM5noN+J1q2M dqMTw5RhK2vZbMEHCiIHhWyFJEapvj+LeISCfiQMnf2BN+MlqO02TpUsyZyQ2uypQjyttgI= -----END CERTIFICATE----- -Buypass Class 2 CA 1 -==================== ------BEGIN CERTIFICATE----- -MIIDUzCCAjugAwIBAgIBATANBgkqhkiG9w0BAQUFADBLMQswCQYDVQQGEwJOTzEdMBsGA1UECgwU -QnV5cGFzcyBBUy05ODMxNjMzMjcxHTAbBgNVBAMMFEJ1eXBhc3MgQ2xhc3MgMiBDQSAxMB4XDTA2 -MTAxMzEwMjUwOVoXDTE2MTAxMzEwMjUwOVowSzELMAkGA1UEBhMCTk8xHTAbBgNVBAoMFEJ1eXBh -c3MgQVMtOTgzMTYzMzI3MR0wGwYDVQQDDBRCdXlwYXNzIENsYXNzIDIgQ0EgMTCCASIwDQYJKoZI -hvcNAQEBBQADggEPADCCAQoCggEBAIs8B0XY9t/mx8q6jUPFR42wWsE425KEHK8T1A9vNkYgxC7M -cXA0ojTTNy7Y3Tp3L8DrKehc0rWpkTSHIln+zNvnma+WwajHQN2lFYxuyHyXA8vmIPLXl18xoS83 -0r7uvqmtqEyeIWZDO6i88wmjONVZJMHCR3axiFyCO7srpgTXjAePzdVBHfCuuCkslFJgNJQ72uA4 -0Z0zPhX0kzLFANq1KWYOOngPIVJfAuWSeyXTkh4vFZ2B5J2O6O+JzhRMVB0cgRJNcKi+EAUXfh/R -uFdV7c27UsKwHnjCTTZoy1YmwVLBvXb3WNVyfh9EdrsAiR0WnVE1703CVu9r4Iw7DekCAwEAAaNC -MEAwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUP42aWYv8e3uco684sDntkHGA1sgwDgYDVR0P -AQH/BAQDAgEGMA0GCSqGSIb3DQEBBQUAA4IBAQAVGn4TirnoB6NLJzKyQJHyIdFkhb5jatLPgcIV -1Xp+DCmsNx4cfHZSldq1fyOhKXdlyTKdqC5Wq2B2zha0jX94wNWZUYN/Xtm+DKhQ7SLHrQVMdvvt -7h5HZPb3J31cKA9FxVxiXqaakZG3Uxcu3K1gnZZkOb1naLKuBctN518fV4bVIJwo+28TOPX2EZL2 -fZleHwzoq0QkKXJAPTZSr4xYkHPB7GEseaHsh7U/2k3ZIQAw3pDaDtMaSKk+hQsUi4y8QZ5q9w5w -wDX3OaJdZtB7WZ+oRxKaJyOkLY4ng5IgodcVf/EuGO70SH8vf/GhGLWhC5SgYiAynB321O+/TIho ------END CERTIFICATE----- - -EBG Elektronik Sertifika Hizmet Sa\xC4\x9Flay\xc4\xb1\x63\xc4\xb1s\xc4\xb1 -========================================================================== ------BEGIN CERTIFICATE----- -MIIF5zCCA8+gAwIBAgIITK9zQhyOdAIwDQYJKoZIhvcNAQEFBQAwgYAxODA2BgNVBAMML0VCRyBF -bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxMTcwNQYDVQQKDC5FQkcg -QmlsacWfaW0gVGVrbm9sb2ppbGVyaSB2ZSBIaXptZXRsZXJpIEEuxZ4uMQswCQYDVQQGEwJUUjAe -Fw0wNjA4MTcwMDIxMDlaFw0xNjA4MTQwMDMxMDlaMIGAMTgwNgYDVQQDDC9FQkcgRWxla3Ryb25p -ayBTZXJ0aWZpa2EgSGl6bWV0IFNhxJ9sYXnEsWPEsXPEsTE3MDUGA1UECgwuRUJHIEJpbGnFn2lt -IFRla25vbG9qaWxlcmkgdmUgSGl6bWV0bGVyaSBBLsWeLjELMAkGA1UEBhMCVFIwggIiMA0GCSqG -SIb3DQEBAQUAA4ICDwAwggIKAoICAQDuoIRh0DpqZhAy2DE4f6en5f2h4fuXd7hxlugTlkaDT7by -X3JWbhNgpQGR4lvFzVcfd2NR/y8927k/qqk153nQ9dAktiHq6yOU/im/+4mRDGSaBUorzAzu8T2b -gmmkTPiab+ci2hC6X5L8GCcKqKpE+i4stPtGmggDg3KriORqcsnlZR9uKg+ds+g75AxuetpX/dfr -eYteIAbTdgtsApWjluTLdlHRKJ2hGvxEok3MenaoDT2/F08iiFD9rrbskFBKW5+VQarKD7JK/oCZ -TqNGFav4c0JqwmZ2sQomFd2TkuzbqV9UIlKRcF0T6kjsbgNs2d1s/OsNA/+mgxKb8amTD8UmTDGy -Y5lhcucqZJnSuOl14nypqZoaqsNW2xCaPINStnuWt6yHd6i58mcLlEOzrz5z+kI2sSXFCjEmN1Zn -uqMLfdb3ic1nobc6HmZP9qBVFCVMLDMNpkGMvQQxahByCp0OLna9XvNRiYuoP1Vzv9s6xiQFlpJI -qkuNKgPlV5EQ9GooFW5Hd4RcUXSfGenmHmMWOeMRFeNYGkS9y8RsZteEBt8w9DeiQyJ50hBs37vm -ExH8nYQKE3vwO9D8owrXieqWfo1IhR5kX9tUoqzVegJ5a9KK8GfaZXINFHDk6Y54jzJ0fFfy1tb0 -Nokb+Clsi7n2l9GkLqq+CxnCRelwXQIDAJ3Zo2MwYTAPBgNVHRMBAf8EBTADAQH/MA4GA1UdDwEB -/wQEAwIBBjAdBgNVHQ4EFgQU587GT/wWZ5b6SqMHwQSny2re2kcwHwYDVR0jBBgwFoAU587GT/wW -Z5b6SqMHwQSny2re2kcwDQYJKoZIhvcNAQEFBQADggIBAJuYml2+8ygjdsZs93/mQJ7ANtyVDR2t -FcU22NU57/IeIl6zgrRdu0waypIN30ckHrMk2pGI6YNw3ZPX6bqz3xZaPt7gyPvT/Wwp+BVGoGgm -zJNSroIBk5DKd8pNSe/iWtkqvTDOTLKBtjDOWU/aWR1qeqRFsIImgYZ29fUQALjuswnoT4cCB64k -XPBfrAowzIpAoHMEwfuJJPaaHFy3PApnNgUIMbOv2AFoKuB4j3TeuFGkjGwgPaL7s9QJ/XvCgKqT -bCmYIai7FvOpEl90tYeY8pUm3zTvilORiF0alKM/fCL414i6poyWqD1SNGKfAB5UVUJnxk1Gj7sU -RT0KlhaOEKGXmdXTMIXM3rRyt7yKPBgpaP3ccQfuJDlq+u2lrDgv+R4QDgZxGhBM/nV+/x5XOULK -1+EVoVZVWRvRo68R2E7DpSvvkL/A7IITW43WciyTTo9qKd+FPNMN4KIYEsxVL0e3p5sC/kH2iExt -2qkBR4NkJ2IQgtYSe14DHzSpyZH+r11thie3I6p1GMog57AP14kOpmciY/SDQSsGS7tY1dHXt7kQ -Y9iJSrSq3RZj9W6+YKH47ejWkE8axsWgKdOnIaj1Wjz3x0miIZpKlVIglnKaZsv30oZDfCK+lvm9 -AahH3eU7QPl1K5srRmSGjR70j/sHd9DqSaIcjVIUpgqT ------END CERTIFICATE----- - certSIGN ROOT CA ================ -----BEGIN CERTIFICATE----- @@ -1647,49 +1225,6 @@ vBTjD4au8as+x6AJzKNI0eDbZOeStc+vckNwi/nDhDwTqn6Sm1dTk/pwwpEOMfmbZ13pljheX7Nz TogVZ96edhBiIL5VaZVDADlN9u6wWk5JRFRYX0KD -----END CERTIFICATE----- -CNNIC ROOT -========== ------BEGIN CERTIFICATE----- -MIIDVTCCAj2gAwIBAgIESTMAATANBgkqhkiG9w0BAQUFADAyMQswCQYDVQQGEwJDTjEOMAwGA1UE -ChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1QwHhcNMDcwNDE2MDcwOTE0WhcNMjcwNDE2MDcw -OTE0WjAyMQswCQYDVQQGEwJDTjEOMAwGA1UEChMFQ05OSUMxEzARBgNVBAMTCkNOTklDIFJPT1Qw -ggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDTNfc/c3et6FtzF8LRb+1VvG7q6KR5smzD -o+/hn7E7SIX1mlwhIhAsxYLO2uOabjfhhyzcuQxauohV3/2q2x8x6gHx3zkBwRP9SFIhxFXf2tiz -VHa6dLG3fdfA6PZZxU3Iva0fFNrfWEQlMhkqx35+jq44sDB7R3IJMfAw28Mbdim7aXZOV/kbZKKT -VrdvmW7bCgScEeOAH8tjlBAKqeFkgjH5jCftppkA9nCTGPihNIaj3XrCGHn2emU1z5DrvTOTn1Or -czvmmzQgLx3vqR1jGqCA2wMv+SYahtKNu6m+UjqHZ0gNv7Sg2Ca+I19zN38m5pIEo3/PIKe38zrK -y5nLAgMBAAGjczBxMBEGCWCGSAGG+EIBAQQEAwIABzAfBgNVHSMEGDAWgBRl8jGtKvf33VKWCscC -wQ7vptU7ETAPBgNVHRMBAf8EBTADAQH/MAsGA1UdDwQEAwIB/jAdBgNVHQ4EFgQUZfIxrSr3991S -lgrHAsEO76bVOxEwDQYJKoZIhvcNAQEFBQADggEBAEs17szkrr/Dbq2flTtLP1se31cpolnKOOK5 -Gv+e5m4y3R6u6jW39ZORTtpC4cMXYFDy0VwmuYK36m3knITnA3kXr5g9lNvHugDnuL8BV8F3RTIM -O/G0HAiw/VGgod2aHRM2mm23xzy54cXZF/qD1T0VoDy7HgviyJA/qIYM/PmLXoXLT1tLYhFHxUV8 -BS9BsZ4QaRuZluBVeftOhpm4lNqGOGqTo+fLbuXf6iFViZx9fX+Y9QCJ7uOEwFyWtcVG6kbghVW2 -G8kS1sHNzYDzAgE8yGnLRUhj2JTQ7IUOO04RZfSCjKY9ri4ilAnIXOo8gV0WKgOXFlUJ24pBgp5m -mxE= ------END CERTIFICATE----- - -ApplicationCA - Japanese Government -=================================== ------BEGIN CERTIFICATE----- -MIIDoDCCAoigAwIBAgIBMTANBgkqhkiG9w0BAQUFADBDMQswCQYDVQQGEwJKUDEcMBoGA1UEChMT -SmFwYW5lc2UgR292ZXJubWVudDEWMBQGA1UECxMNQXBwbGljYXRpb25DQTAeFw0wNzEyMTIxNTAw -MDBaFw0xNzEyMTIxNTAwMDBaMEMxCzAJBgNVBAYTAkpQMRwwGgYDVQQKExNKYXBhbmVzZSBHb3Zl -cm5tZW50MRYwFAYDVQQLEw1BcHBsaWNhdGlvbkNBMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB -CgKCAQEAp23gdE6Hj6UG3mii24aZS2QNcfAKBZuOquHMLtJqO8F6tJdhjYq+xpqcBrSGUeQ3DnR4 -fl+Kf5Sk10cI/VBaVuRorChzoHvpfxiSQE8tnfWuREhzNgaeZCw7NCPbXCbkcXmP1G55IrmTwcrN -wVbtiGrXoDkhBFcsovW8R0FPXjQilbUfKW1eSvNNcr5BViCH/OlQR9cwFO5cjFW6WY2H/CPek9AE -jP3vbb3QesmlOmpyM8ZKDQUXKi17safY1vC+9D/qDihtQWEjdnjDuGWk81quzMKq2edY3rZ+nYVu -nyoKb58DKTCXKB28t89UKU5RMfkntigm/qJj5kEW8DOYRwIDAQABo4GeMIGbMB0GA1UdDgQWBBRU -WssmP3HMlEYNllPqa0jQk/5CdTAOBgNVHQ8BAf8EBAMCAQYwWQYDVR0RBFIwUKROMEwxCzAJBgNV -BAYTAkpQMRgwFgYDVQQKDA/ml6XmnKzlm73mlL/lupwxIzAhBgNVBAsMGuOCouODl+ODquOCseOD -vOOCt+ODp+ODs0NBMA8GA1UdEwEB/wQFMAMBAf8wDQYJKoZIhvcNAQEFBQADggEBADlqRHZ3ODrs -o2dGD/mLBqj7apAxzn7s2tGJfHrrLgy9mTLnsCTWw//1sogJhyzjVOGjprIIC8CFqMjSnHH2HZ9g -/DgzE+Ge3Atf2hZQKXsvcJEPmbo0NI2VdMV+eKlmXb3KIXdCEKxmJj3ekav9FfBv7WxfEPjzFvYD -io+nEhEMy/0/ecGc/WLuo89UDNErXxc+4z6/wCs+CZv+iKZ+tJIX/COUgb1up8WMwusRRdv4QcmW -dupwX3kSa+SjB1oF7ydJzyGfikwJcGapJsErEU4z0g781mzSDjJkaP+tBXhfAx2o45CsJOAPQKdL -rosot4LKGAfmt1t06SAZf7IbiVQ= ------END CERTIFICATE----- - GeoTrust Primary Certification Authority - G3 ============================================= -----BEGIN CERTIFICATE----- @@ -1821,7 +1356,7 @@ AJw9SDkjOVgaFRJZap7v1VmyHVIsmXHNxynfGyphe3HR3vPA5Q06Sqotp9iGKt0uEA== -----END CERTIFICATE----- NetLock Arany (Class Gold) Főtanúsítvány -============================================ +======================================== -----BEGIN CERTIFICATE----- MIIEFTCCAv2gAwIBAgIGSUEs5AAQMA0GCSqGSIb3DQEBCwUAMIGnMQswCQYDVQQGEwJIVTERMA8G A1UEBwwIQnVkYXBlc3QxFTATBgNVBAoMDE5ldExvY2sgS2Z0LjE3MDUGA1UECwwuVGFuw7pzw610 @@ -1876,58 +1411,6 @@ IPVVYpbtbZNQvOSqeK3Zywplh6ZmwcSBo3c6WB4L7oOLnR7SUqTMHW+wmG2UMbX4cQrcufx9MmDm 66+KAQ== -----END CERTIFICATE----- -CA Disig -======== ------BEGIN CERTIFICATE----- -MIIEDzCCAvegAwIBAgIBATANBgkqhkiG9w0BAQUFADBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMK -QnJhdGlzbGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwHhcNMDYw -MzIyMDEzOTM0WhcNMTYwMzIyMDEzOTM0WjBKMQswCQYDVQQGEwJTSzETMBEGA1UEBxMKQnJhdGlz -bGF2YTETMBEGA1UEChMKRGlzaWcgYS5zLjERMA8GA1UEAxMIQ0EgRGlzaWcwggEiMA0GCSqGSIb3 -DQEBAQUAA4IBDwAwggEKAoIBAQCS9jHBfYj9mQGp2HvycXXxMcbzdWb6UShGhJd4NLxs/LxFWYgm -GErENx+hSkS943EE9UQX4j/8SFhvXJ56CbpRNyIjZkMhsDxkovhqFQ4/61HhVKndBpnXmjxUizkD -Pw/Fzsbrg3ICqB9x8y34dQjbYkzo+s7552oftms1grrijxaSfQUMbEYDXcDtab86wYqg6I7ZuUUo -hwjstMoVvoLdtUSLLa2GDGhibYVW8qwUYzrG0ZmsNHhWS8+2rT+MitcE5eN4TPWGqvWP+j1scaMt -ymfraHtuM6kMgiioTGohQBUgDCZbg8KpFhXAJIJdKxatymP2dACw30PEEGBWZ2NFAgMBAAGjgf8w -gfwwDwYDVR0TAQH/BAUwAwEB/zAdBgNVHQ4EFgQUjbJJaJ1yCCW5wCf1UJNWSEZx+Y8wDgYDVR0P -AQH/BAQDAgEGMDYGA1UdEQQvMC2BE2Nhb3BlcmF0b3JAZGlzaWcuc2uGFmh0dHA6Ly93d3cuZGlz -aWcuc2svY2EwZgYDVR0fBF8wXTAtoCugKYYnaHR0cDovL3d3dy5kaXNpZy5zay9jYS9jcmwvY2Ff -ZGlzaWcuY3JsMCygKqAohiZodHRwOi8vY2EuZGlzaWcuc2svY2EvY3JsL2NhX2Rpc2lnLmNybDAa -BgNVHSAEEzARMA8GDSuBHpGT5goAAAABAQEwDQYJKoZIhvcNAQEFBQADggEBAF00dGFMrzvY/59t -WDYcPQuBDRIrRhCA/ec8J9B6yKm2fnQwM6M6int0wHl5QpNt/7EpFIKrIYwvF/k/Ji/1WcbvgAa3 -mkkp7M5+cTxqEEHA9tOasnxakZzArFvITV734VP/Q3f8nktnbNfzg9Gg4H8l37iYC5oyOGwwoPP/ -CBUz91BKez6jPiCp3C9WgArtQVCwyfTssuMmRAAOb54GvCKWU3BlxFAKRmukLyeBEicTXxChds6K -ezfqwzlhA5WYOudsiCUI/HloDYd9Yvi0X/vF2Ey9WLw/Q1vUHgFNPGO+I++MzVpQuGhU+QqZMxEA -4Z7CRneC9VkGjCFMhwnN5ag= ------END CERTIFICATE----- - -Juur-SK -======= ------BEGIN CERTIFICATE----- -MIIE5jCCA86gAwIBAgIEO45L/DANBgkqhkiG9w0BAQUFADBdMRgwFgYJKoZIhvcNAQkBFglwa2lA -c2suZWUxCzAJBgNVBAYTAkVFMSIwIAYDVQQKExlBUyBTZXJ0aWZpdHNlZXJpbWlza2Vza3VzMRAw -DgYDVQQDEwdKdXVyLVNLMB4XDTAxMDgzMDE0MjMwMVoXDTE2MDgyNjE0MjMwMVowXTEYMBYGCSqG -SIb3DQEJARYJcGtpQHNrLmVlMQswCQYDVQQGEwJFRTEiMCAGA1UEChMZQVMgU2VydGlmaXRzZWVy -aW1pc2tlc2t1czEQMA4GA1UEAxMHSnV1ci1TSzCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC -ggEBAIFxNj4zB9bjMI0TfncyRsvPGbJgMUaXhvSYRqTCZUXP00B841oiqBB4M8yIsdOBSvZiF3tf -TQou0M+LI+5PAk676w7KvRhj6IAcjeEcjT3g/1tf6mTll+g/mX8MCgkzABpTpyHhOEvWgxutr2TC -+Rx6jGZITWYfGAriPrsfB2WThbkasLnE+w0R9vXW+RvHLCu3GFH+4Hv2qEivbDtPL+/40UceJlfw -UR0zlv/vWT3aTdEVNMfqPxZIe5EcgEMPPbgFPtGzlc3Yyg/CQ2fbt5PgIoIuvvVoKIO5wTtpeyDa -Tpxt4brNj3pssAki14sL2xzVWiZbDcDq5WDQn/413z8CAwEAAaOCAawwggGoMA8GA1UdEwEB/wQF -MAMBAf8wggEWBgNVHSAEggENMIIBCTCCAQUGCisGAQQBzh8BAQEwgfYwgdAGCCsGAQUFBwICMIHD -HoHAAFMAZQBlACAAcwBlAHIAdABpAGYAaQBrAGEAYQB0ACAAbwBuACAAdgDkAGwAagBhAHMAdABh -AHQAdQBkACAAQQBTAC0AaQBzACAAUwBlAHIAdABpAGYAaQB0AHMAZQBlAHIAaQBtAGkAcwBrAGUA -cwBrAHUAcwAgAGEAbABhAG0ALQBTAEsAIABzAGUAcgB0AGkAZgBpAGsAYQBhAHQAaQBkAGUAIABr -AGkAbgBuAGkAdABhAG0AaQBzAGUAawBzMCEGCCsGAQUFBwIBFhVodHRwOi8vd3d3LnNrLmVlL2Nw -cy8wKwYDVR0fBCQwIjAgoB6gHIYaaHR0cDovL3d3dy5zay5lZS9qdXVyL2NybC8wHQYDVR0OBBYE -FASqekej5ImvGs8KQKcYP2/v6X2+MB8GA1UdIwQYMBaAFASqekej5ImvGs8KQKcYP2/v6X2+MA4G -A1UdDwEB/wQEAwIB5jANBgkqhkiG9w0BAQUFAAOCAQEAe8EYlFOiCfP+JmeaUOTDBS8rNXiRTHyo -ERF5TElZrMj3hWVcRrs7EKACr81Ptcw2Kuxd/u+gkcm2k298gFTsxwhwDY77guwqYHhpNjbRxZyL -abVAyJRld/JXIWY7zoVAtjNjGr95HvxcHdMdkxuLDF2FvZkwMhgJkVLpfKG6/2SSmuz+Ne6ML678 -IIbsSt4beDI3poHSna9aEhbKmVv8b20OxaAehsmR0FyYgl9jDIpaq9iVpszLita/ZEuOyoqysOkh -Mp6qqIWYNIE5ITuoOlIyPfZrN4YGWhWY3PARZv40ILcD9EEQfTmEeZZyY7aWAuVrua0ZTbvGRNs2 -yyqcjg== ------END CERTIFICATE----- - Hongkong Post Root CA 1 ======================= -----BEGIN CERTIFICATE----- @@ -2361,7 +1844,7 @@ Zt3hrvJBW8qYVoNzcOSGGtIxQbovvi0TWnZvTuhOgQ4/WwMioBK+ZlgRSssDxLQqKi2WF+A5VLxI -----END CERTIFICATE----- Certinomis - Autorité Racine -============================= +============================ -----BEGIN CERTIFICATE----- MIIFnDCCA4SgAwIBAgIBATANBgkqhkiG9w0BAQUFADBjMQswCQYDVQQGEwJGUjETMBEGA1UEChMK Q2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxJjAkBgNVBAMMHUNlcnRpbm9taXMg @@ -2391,41 +1874,6 @@ wk01+dIL8hf2rGbVJLJP0RyZwG71fet0BLj5TXcJ17TPBzAJ8bgAVtkXFhYKK4bfjwEZGuW7gmP/ vgt2Fl43N+bYdJeimUV5 -----END CERTIFICATE----- -Root CA Generalitat Valenciana -============================== ------BEGIN CERTIFICATE----- -MIIGizCCBXOgAwIBAgIEO0XlaDANBgkqhkiG9w0BAQUFADBoMQswCQYDVQQGEwJFUzEfMB0GA1UE -ChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290 -IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwHhcNMDEwNzA2MTYyMjQ3WhcNMjEwNzAxMTUyMjQ3 -WjBoMQswCQYDVQQGEwJFUzEfMB0GA1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UE -CxMGUEtJR1ZBMScwJQYDVQQDEx5Sb290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmEwggEiMA0G -CSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDGKqtXETcvIorKA3Qdyu0togu8M1JAJke+WmmmO3I2 -F0zo37i7L3bhQEZ0ZQKQUgi0/6iMweDHiVYQOTPvaLRfX9ptI6GJXiKjSgbwJ/BXufjpTjJ3Cj9B -ZPPrZe52/lSqfR0grvPXdMIKX/UIKFIIzFVd0g/bmoGlu6GzwZTNVOAydTGRGmKy3nXiz0+J2ZGQ -D0EbtFpKd71ng+CT516nDOeB0/RSrFOyA8dEJvt55cs0YFAQexvba9dHq198aMpunUEDEO5rmXte -JajCq+TA81yc477OMUxkHl6AovWDfgzWyoxVjr7gvkkHD6MkQXpYHYTqWBLI4bft75PelAgxAgMB -AAGjggM7MIIDNzAyBggrBgEFBQcBAQQmMCQwIgYIKwYBBQUHMAGGFmh0dHA6Ly9vY3NwLnBraS5n -dmEuZXMwEgYDVR0TAQH/BAgwBgEB/wIBAjCCAjQGA1UdIASCAiswggInMIICIwYKKwYBBAG/VQIB -ADCCAhMwggHoBggrBgEFBQcCAjCCAdoeggHWAEEAdQB0AG8AcgBpAGQAYQBkACAAZABlACAAQwBl -AHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAFIAYQDtAHoAIABkAGUAIABsAGEAIABHAGUAbgBlAHIA -YQBsAGkAdABhAHQAIABWAGEAbABlAG4AYwBpAGEAbgBhAC4ADQAKAEwAYQAgAEQAZQBjAGwAYQBy -AGEAYwBpAPMAbgAgAGQAZQAgAFAAcgDhAGMAdABpAGMAYQBzACAAZABlACAAQwBlAHIAdABpAGYA -aQBjAGEAYwBpAPMAbgAgAHEAdQBlACAAcgBpAGcAZQAgAGUAbAAgAGYAdQBuAGMAaQBvAG4AYQBt -AGkAZQBuAHQAbwAgAGQAZQAgAGwAYQAgAHAAcgBlAHMAZQBuAHQAZQAgAEEAdQB0AG8AcgBpAGQA -YQBkACAAZABlACAAQwBlAHIAdABpAGYAaQBjAGEAYwBpAPMAbgAgAHMAZQAgAGUAbgBjAHUAZQBu -AHQAcgBhACAAZQBuACAAbABhACAAZABpAHIAZQBjAGMAaQDzAG4AIAB3AGUAYgAgAGgAdAB0AHAA -OgAvAC8AdwB3AHcALgBwAGsAaQAuAGcAdgBhAC4AZQBzAC8AYwBwAHMwJQYIKwYBBQUHAgEWGWh0 -dHA6Ly93d3cucGtpLmd2YS5lcy9jcHMwHQYDVR0OBBYEFHs100DSHHgZZu90ECjcPk+yeAT8MIGV -BgNVHSMEgY0wgYqAFHs100DSHHgZZu90ECjcPk+yeAT8oWykajBoMQswCQYDVQQGEwJFUzEfMB0G -A1UEChMWR2VuZXJhbGl0YXQgVmFsZW5jaWFuYTEPMA0GA1UECxMGUEtJR1ZBMScwJQYDVQQDEx5S -b290IENBIEdlbmVyYWxpdGF0IFZhbGVuY2lhbmGCBDtF5WgwDQYJKoZIhvcNAQEFBQADggEBACRh -TvW1yEICKrNcda3FbcrnlD+laJWIwVTAEGmiEi8YPyVQqHxK6sYJ2fR1xkDar1CdPaUWu20xxsdz -Ckj+IHLtb8zog2EWRpABlUt9jppSCS/2bxzkoXHPjCpaF3ODR00PNvsETUlR4hTJZGH71BTg9J63 -NI8KJr2XXPR5OkowGcytT6CYirQxlyric21+eLj4iIlPsSKRZEv1UN4D2+XFducTZnV+ZfsBn5OH -iJ35Rld8TWCvmHMTI6QgkYH60GFmuH3Rr9ZvHmw96RH9qfmCIoaZM3Fa6hlXPZHNqcCjbgcTpsnt -+GijnsNacgmHKNHEc8RzGF9QdRYxn7fofMM= ------END CERTIFICATE----- - TWCA Root Certification Authority ================================= -----BEGIN CERTIFICATE----- @@ -2871,93 +2319,6 @@ poLWccret9W6aAjtmcz9opLLabid+Qqkpj5PkygqYWwHJgD/ll9ohri4zspV4KuxPX+Y1zMOWj3Y eMLEYC/HYvBhkdI4sPaeVdtAgAUSM84dkpvRabP/v/GSCmE1P93+hvS84Bpxs2Km -----END CERTIFICATE----- -China Internet Network Information Center EV Certificates Root -============================================================== ------BEGIN CERTIFICATE----- -MIID9zCCAt+gAwIBAgIESJ8AATANBgkqhkiG9w0BAQUFADCBijELMAkGA1UEBhMCQ04xMjAwBgNV -BAoMKUNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyMUcwRQYDVQQDDD5D -aGluYSBJbnRlcm5ldCBOZXR3b3JrIEluZm9ybWF0aW9uIENlbnRlciBFViBDZXJ0aWZpY2F0ZXMg -Um9vdDAeFw0xMDA4MzEwNzExMjVaFw0zMDA4MzEwNzExMjVaMIGKMQswCQYDVQQGEwJDTjEyMDAG -A1UECgwpQ2hpbmEgSW50ZXJuZXQgTmV0d29yayBJbmZvcm1hdGlvbiBDZW50ZXIxRzBFBgNVBAMM -PkNoaW5hIEludGVybmV0IE5ldHdvcmsgSW5mb3JtYXRpb24gQ2VudGVyIEVWIENlcnRpZmljYXRl -cyBSb290MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAm35z7r07eKpkQ0H1UN+U8i6y -jUqORlTSIRLIOTJCBumD1Z9S7eVnAztUwYyZmczpwA//DdmEEbK40ctb3B75aDFk4Zv6dOtouSCV -98YPjUesWgbdYavi7NifFy2cyjw1l1VxzUOFsUcW9SxTgHbP0wBkvUCZ3czY28Sf1hNfQYOL+Q2H -klY0bBoQCxfVWhyXWIQ8hBouXJE0bhlffxdpxWXvayHG1VA6v2G5BY3vbzQ6sm8UY78WO5upKv23 -KzhmBsUs4qpnHkWnjQRmQvaPK++IIGmPMowUc9orhpFjIpryp9vOiYurXccUwVswah+xt54ugQEC -7c+WXmPbqOY4twIDAQABo2MwYTAfBgNVHSMEGDAWgBR8cks5x8DbYqVPm6oYNJKiyoOCWTAPBgNV -HRMBAf8EBTADAQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUfHJLOcfA22KlT5uqGDSSosqD -glkwDQYJKoZIhvcNAQEFBQADggEBACrDx0M3j92tpLIM7twUbY8opJhJywyA6vPtI2Z1fcXTIWd5 -0XPFtQO3WKwMVC/GVhMPMdoG52U7HW8228gd+f2ABsqjPWYWqJ1MFn3AlUa1UeTiH9fqBk1jjZaM -7+czV0I664zBechNdn3e9rG3geCg+aF4RhcaVpjwTj2rHO3sOdwHSPdj/gauwqRcalsyiMXHM4Ws -ZkJHwlgkmeHlPuV1LI5D1l08eB6olYIpUNHRFrrvwb562bTYzB5MRuF3sTGrvSrIzo9uoV1/A3U0 -5K2JRVRevq4opbs/eHnrc7MKDf2+yfdWrPa37S+bISnHOLaVxATywy39FCqQmbkHzJ8= ------END CERTIFICATE----- - -Swisscom Root CA 2 -================== ------BEGIN CERTIFICATE----- -MIIF2TCCA8GgAwIBAgIQHp4o6Ejy5e/DfEoeWhhntjANBgkqhkiG9w0BAQsFADBkMQswCQYDVQQG -EwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsTHERpZ2l0YWwgQ2VydGlmaWNhdGUgU2Vy -dmljZXMxGzAZBgNVBAMTElN3aXNzY29tIFJvb3QgQ0EgMjAeFw0xMTA2MjQwODM4MTRaFw0zMTA2 -MjUwNzM4MTRaMGQxCzAJBgNVBAYTAmNoMREwDwYDVQQKEwhTd2lzc2NvbTElMCMGA1UECxMcRGln -aXRhbCBDZXJ0aWZpY2F0ZSBTZXJ2aWNlczEbMBkGA1UEAxMSU3dpc3Njb20gUm9vdCBDQSAyMIIC -IjANBgkqhkiG9w0BAQEFAAOCAg8AMIICCgKCAgEAlUJOhJ1R5tMJ6HJaI2nbeHCOFvErjw0DzpPM -LgAIe6szjPTpQOYXTKueuEcUMncy3SgM3hhLX3af+Dk7/E6J2HzFZ++r0rk0X2s682Q2zsKwzxNo -ysjL67XiPS4h3+os1OD5cJZM/2pYmLcX5BtS5X4HAB1f2uY+lQS3aYg5oUFgJWFLlTloYhyxCwWJ -wDaCFCE/rtuh/bxvHGCGtlOUSbkrRsVPACu/obvLP+DHVxxX6NZp+MEkUp2IVd3Chy50I9AU/SpH -Wrumnf2U5NGKpV+GY3aFy6//SSj8gO1MedK75MDvAe5QQQg1I3ArqRa0jG6F6bYRzzHdUyYb3y1a -SgJA/MTAtukxGggo5WDDH8SQjhBiYEQN7Aq+VRhxLKX0srwVYv8c474d2h5Xszx+zYIdkeNL6yxS -NLCK/RJOlrDrcH+eOfdmQrGrrFLadkBXeyq96G4DsguAhYidDMfCd7Camlf0uPoTXGiTOmekl9Ab -mbeGMktg2M7v0Ax/lZ9vh0+Hio5fCHyqW/xavqGRn1V9TrALacywlKinh/LTSlDcX3KwFnUey7QY -Ypqwpzmqm59m2I2mbJYV4+by+PGDYmy7Velhk6M99bFXi08jsJvllGov34zflVEpYKELKeRcVVi3 -qPyZ7iVNTA6z00yPhOgpD/0QVAKFyPnlw4vP5w8CAwEAAaOBhjCBgzAOBgNVHQ8BAf8EBAMCAYYw -HQYDVR0hBBYwFDASBgdghXQBUwIBBgdghXQBUwIBMBIGA1UdEwEB/wQIMAYBAf8CAQcwHQYDVR0O -BBYEFE0mICKJS9PVpAqhb97iEoHF8TwuMB8GA1UdIwQYMBaAFE0mICKJS9PVpAqhb97iEoHF8Twu -MA0GCSqGSIb3DQEBCwUAA4ICAQAyCrKkG8t9voJXiblqf/P0wS4RfbgZPnm3qKhyN2abGu2sEzsO -v2LwnN+ee6FTSA5BesogpxcbtnjsQJHzQq0Qw1zv/2BZf82Fo4s9SBwlAjxnffUy6S8w5X2lejjQ -82YqZh6NM4OKb3xuqFp1mrjX2lhIREeoTPpMSQpKwhI3qEAMw8jh0FcNlzKVxzqfl9NX+Ave5XLz -o9v/tdhZsnPdTSpxsrpJ9csc1fV5yJmz/MFMdOO0vSk3FQQoHt5FRnDsr7p4DooqzgB53MBfGWcs -a0vvaGgLQ+OswWIJ76bdZWGgr4RVSJFSHMYlkSrQwSIjYVmvRRGFHQEkNI/Ps/8XciATwoCqISxx -OQ7Qj1zB09GOInJGTB2Wrk9xseEFKZZZ9LuedT3PDTcNYtsmjGOpI99nBjx8Oto0QuFmtEYE3saW -mA9LSHokMnWRn6z3aOkquVVlzl1h0ydw2Df+n7mvoC5Wt6NlUe07qxS/TFED6F+KBZvuim6c779o -+sjaC+NCydAXFJy3SuCvkychVSa1ZC+N8f+mQAWFBVzKBxlcCxMoTFh/wqXvRdpg065lYZ1Tg3TC -rvJcwhbtkj6EPnNgiLx29CzP0H1907he0ZESEOnN3col49XtmS++dYFLJPlFRpTJKSFTnCZFqhMX -5OfNeOI5wSsSnqaeG8XmDtkx2Q== ------END CERTIFICATE----- - -Swisscom Root EV CA 2 -===================== ------BEGIN CERTIFICATE----- -MIIF4DCCA8igAwIBAgIRAPL6ZOJ0Y9ON/RAdBB92ylgwDQYJKoZIhvcNAQELBQAwZzELMAkGA1UE -BhMCY2gxETAPBgNVBAoTCFN3aXNzY29tMSUwIwYDVQQLExxEaWdpdGFsIENlcnRpZmljYXRlIFNl -cnZpY2VzMR4wHAYDVQQDExVTd2lzc2NvbSBSb290IEVWIENBIDIwHhcNMTEwNjI0MDk0NTA4WhcN -MzEwNjI1MDg0NTA4WjBnMQswCQYDVQQGEwJjaDERMA8GA1UEChMIU3dpc3Njb20xJTAjBgNVBAsT -HERpZ2l0YWwgQ2VydGlmaWNhdGUgU2VydmljZXMxHjAcBgNVBAMTFVN3aXNzY29tIFJvb3QgRVYg -Q0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAMT3HS9X6lds93BdY7BxUglgRCgz -o3pOCvrY6myLURYaVa5UJsTMRQdBTxB5f3HSek4/OE6zAMaVylvNwSqD1ycfMQ4jFrclyxy0uYAy -Xhqdk/HoPGAsp15XGVhRXrwsVgu42O+LgrQ8uMIkqBPHoCE2G3pXKSinLr9xJZDzRINpUKTk4Rti -GZQJo/PDvO/0vezbE53PnUgJUmfANykRHvvSEaeFGHR55E+FFOtSN+KxRdjMDUN/rhPSays/p8Li -qG12W0OfvrSdsyaGOx9/5fLoZigWJdBLlzin5M8J0TbDC77aO0RYjb7xnglrPvMyxyuHxuxenPaH -Za0zKcQvidm5y8kDnftslFGXEBuGCxobP/YCfnvUxVFkKJ3106yDgYjTdLRZncHrYTNaRdHLOdAG -alNgHa/2+2m8atwBz735j9m9W8E6X47aD0upm50qKGsaCnw8qyIL5XctcfaCNYGu+HuB5ur+rPQa -m3Rc6I8k9l2dRsQs0h4rIWqDJ2dVSqTjyDKXZpBy2uPUZC5f46Fq9mDU5zXNysRojddxyNMkM3Ox -bPlq4SjbX8Y96L5V5jcb7STZDxmPX2MYWFCBUWVv8p9+agTnNCRxunZLWB4ZvRVgRaoMEkABnRDi -xzgHcgplwLa7JSnaFp6LNYth7eVxV4O1PHGf40+/fh6Bn0GXAgMBAAGjgYYwgYMwDgYDVR0PAQH/ -BAQDAgGGMB0GA1UdIQQWMBQwEgYHYIV0AVMCAgYHYIV0AVMCAjASBgNVHRMBAf8ECDAGAQH/AgED -MB0GA1UdDgQWBBRF2aWBbj2ITY1x0kbBbkUe88SAnTAfBgNVHSMEGDAWgBRF2aWBbj2ITY1x0kbB -bkUe88SAnTANBgkqhkiG9w0BAQsFAAOCAgEAlDpzBp9SSzBc1P6xXCX5145v9Ydkn+0UjrgEjihL -j6p7jjm02Vj2e6E1CqGdivdj5eu9OYLU43otb98TPLr+flaYC/NUn81ETm484T4VvwYmneTwkLbU -wp4wLh/vx3rEUMfqe9pQy3omywC0Wqu1kx+AiYQElY2NfwmTv9SoqORjbdlk5LgpWgi/UOGED1V7 -XwgiG/W9mR4U9s70WBCCswo9GcG/W6uqmdjyMb3lOGbcWAXH7WMaLgqXfIeTK7KK4/HsGOV1timH -59yLGn602MnTihdsfSlEvoqq9X46Lmgxk7lq2prg2+kupYTNHAq4Sgj5nPFhJpiTt3tm7JFe3VE/ -23MPrQRYCd0EApUKPtN236YQHoA96M2kZNEzx5LH4k5E4wnJTsJdhw4Snr8PyQUQ3nqjsTzyP6Wq -J3mtMX0f/fwZacXduT98zca0wjAefm6S139hdlqP65VNvBFuIXxZN5nQBrz5Bm0yFqXZaajh3DyA -HmBR3NdUIR7KYndP+tiPsys6DXhyyWhBWkdKwqPrGtcKqzwyVcgKEZzfdNbwQBUdyLmPtTbFr/gi -uMod89a2GQ+fYWVq6nTIfI/DT11lgh/ZDYnadXL77/FHZxOzyNEZiCcmmpl5fx7kLD977vHeTYuW -l8PVP3wbI+2ksx0WckNLIOFZfsLorSa/ovc= ------END CERTIFICATE----- - CA Disig Root R1 ================ -----BEGIN CERTIFICATE----- @@ -3756,7 +3117,7 @@ ekD6819kR5LLU7m7Wc5P/dAVUwHY3+vZ5nbv0CO7O6l5s9UCKc2Jo5YPSjXnTkLAdc0Hz+Ys63su -----END CERTIFICATE----- TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H5 -========================================================= +==================================================== -----BEGIN CERTIFICATE----- MIIEJzCCAw+gAwIBAgIHAI4X/iQggTANBgkqhkiG9w0BAQsFADCBsTELMAkGA1UEBhMCVFIxDzAN BgNVBAcMBkFua2FyYTFNMEsGA1UECgxEVMOcUktUUlVTVCBCaWxnaSDEsGxldGnFn2ltIHZlIEJp @@ -3779,30 +3140,6 @@ lpKQd/Ct9JDpEXjXk4nAPQu6KfTomZ1yju2dL+6SfaHx/126M2CFYv4HAqGEVka+lgqaE9chTLd8 B59OTj+RdPsnnRHM3eaxynFNExc5JsUpISuTKWqW+qtB4Uu2NQvAmxU= -----END CERTIFICATE----- -TÜRKTRUST Elektronik Sertifika Hizmet Sağlayıcısı H6 -========================================================= ------BEGIN CERTIFICATE----- -MIIEJjCCAw6gAwIBAgIGfaHyZeyKMA0GCSqGSIb3DQEBCwUAMIGxMQswCQYDVQQGEwJUUjEPMA0G -A1UEBwwGQW5rYXJhMU0wSwYDVQQKDERUw5xSS1RSVVNUIEJpbGdpIMSwbGV0acWfaW0gdmUgQmls -acWfaW0gR8O8dmVubGnEn2kgSGl6bWV0bGVyaSBBLsWeLjFCMEAGA1UEAww5VMOcUktUUlVTVCBF -bGVrdHJvbmlrIFNlcnRpZmlrYSBIaXptZXQgU2HEn2xhecSxY8Sxc8SxIEg2MB4XDTEzMTIxODA5 -MDQxMFoXDTIzMTIxNjA5MDQxMFowgbExCzAJBgNVBAYTAlRSMQ8wDQYDVQQHDAZBbmthcmExTTBL -BgNVBAoMRFTDnFJLVFJVU1QgQmlsZ2kgxLBsZXRpxZ9pbSB2ZSBCaWxpxZ9pbSBHw7x2ZW5sacSf -aSBIaXptZXRsZXJpIEEuxZ4uMUIwQAYDVQQDDDlUw5xSS1RSVVNUIEVsZWt0cm9uaWsgU2VydGlm -aWthIEhpem1ldCBTYcSfbGF5xLFjxLFzxLEgSDYwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK -AoIBAQCdsGjW6L0UlqMACprx9MfMkU1xeHe59yEmFXNRFpQJRwXiM/VomjX/3EsvMsew7eKC5W/a -2uqsxgbPJQ1BgfbBOCK9+bGlprMBvD9QFyv26WZV1DOzXPhDIHiTVRZwGTLmiddk671IUP320EED -wnS3/faAz1vFq6TWlRKb55cTMgPp1KtDWxbtMyJkKbbSk60vbNg9tvYdDjTu0n2pVQ8g9P0pu5Fb -HH3GQjhtQiht1AH7zYiXSX6484P4tZgvsycLSF5W506jM7NE1qXyGJTtHB6plVxiSvgNZ1GpryHV -+DKdeboaX+UEVU0TRv/yz3THGmNtwx8XEsMeED5gCLMxAgMBAAGjQjBAMB0GA1UdDgQWBBTdVRcT -9qzoSCHK77Wv0QAy7Z6MtTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB/zANBgkqhkiG -9w0BAQsFAAOCAQEAb1gNl0OqFlQ+v6nfkkU/hQu7VtMMUszIv3ZnXuaqs6fvuay0EBQNdH49ba3R -fdCaqaXKGDsCQC4qnFAUi/5XfldcEQlLNkVS9z2sFP1E34uXI9TDwe7UU5X+LEr+DXCqu4svLcsy -o4LyVN/Y8t3XSHLuSqMplsNEzm61kod2pLv0kmzOLBQJZo6NrRa1xxsJYTvjIKIDgI6tflEATseW -hvtDmHd9KMeP2Cpu54Rvl0EpABZeTeIT6lnAY2c6RPuY/ATTMHKm9ocJV612ph1jmv3XZch4gyt1 -O6VbuA1df74jrlZVlFjvH4GMKrLN5ptjnhi85WsGtAuYSyher4hYyw== ------END CERTIFICATE----- - Certinomis - Root CA ==================== -----BEGIN CERTIFICATE----- @@ -3891,3 +3228,419 @@ MluARZPzA7gwCgYIKoZIzj0EAwMDaAAwZQIxAOSkhLCB1T2wdKyUpOgOPQB0TKGXa/kNUTyh2Tv0 Daupn75OcsqF1NnstTJFGG+rrQIwfcf3aWMvoeGY7xMQ0Xk/0f7qO3/eVvSQsRUR2LIiFdAvwyYu a/GRspBl9JrmkO5K -----END CERTIFICATE----- + +SZAFIR ROOT CA2 +=============== +-----BEGIN CERTIFICATE----- +MIIDcjCCAlqgAwIBAgIUPopdB+xV0jLVt+O2XwHrLdzk1uQwDQYJKoZIhvcNAQELBQAwUTELMAkG +A1UEBhMCUEwxKDAmBgNVBAoMH0tyYWpvd2EgSXpiYSBSb3psaWN6ZW5pb3dhIFMuQS4xGDAWBgNV +BAMMD1NaQUZJUiBST09UIENBMjAeFw0xNTEwMTkwNzQzMzBaFw0zNTEwMTkwNzQzMzBaMFExCzAJ +BgNVBAYTAlBMMSgwJgYDVQQKDB9LcmFqb3dhIEl6YmEgUm96bGljemVuaW93YSBTLkEuMRgwFgYD +VQQDDA9TWkFGSVIgUk9PVCBDQTIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQC3vD5Q +qEvNQLXOYeeWyrSh2gwisPq1e3YAd4wLz32ohswmUeQgPYUM1ljj5/QqGJ3a0a4m7utT3PSQ1hNK +DJA8w/Ta0o4NkjrcsbH/ON7Dui1fgLkCvUqdGw+0w8LBZwPd3BucPbOw3gAeqDRHu5rr/gsUvTaE +2g0gv/pby6kWIK05YO4vdbbnl5z5Pv1+TW9NL++IDWr63fE9biCloBK0TXC5ztdyO4mTp4CEHCdJ +ckm1/zuVnsHMyAHs6A6KCpbns6aH5db5BSsNl0BwPLqsdVqc1U2dAgrSS5tmS0YHF2Wtn2yIANwi +ieDhZNRnvDF5YTy7ykHNXGoAyDw4jlivAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0P +AQH/BAQDAgEGMB0GA1UdDgQWBBQuFqlKGLXLzPVvUPMjX/hd56zwyDANBgkqhkiG9w0BAQsFAAOC +AQEAtXP4A9xZWx126aMqe5Aosk3AM0+qmrHUuOQn/6mWmc5G4G18TKI4pAZw8PRBEew/R40/cof5 +O/2kbytTAOD/OblqBw7rHRz2onKQy4I9EYKL0rufKq8h5mOGnXkZ7/e7DDWQw4rtTw/1zBLZpD67 +oPwglV9PJi8RI4NOdQcPv5vRtB3pEAT+ymCPoky4rc/hkA/NrgrHXXu3UNLUYfrVFdvXn4dRVOul +4+vJhaAlIDf7js4MNIThPIGyd05DpYhfhmehPea0XGG2Ptv+tyjFogeutcrKjSoS75ftwjCkySp6 ++/NNIxuZMzSgLvWpCz/UXeHPhJ/iGcJfitYgHuNztw== +-----END CERTIFICATE----- + +Certum Trusted Network CA 2 +=========================== +-----BEGIN CERTIFICATE----- +MIIF0jCCA7qgAwIBAgIQIdbQSk8lD8kyN/yqXhKN6TANBgkqhkiG9w0BAQ0FADCBgDELMAkGA1UE +BhMCUEwxIjAgBgNVBAoTGVVuaXpldG8gVGVjaG5vbG9naWVzIFMuQS4xJzAlBgNVBAsTHkNlcnR1 +bSBDZXJ0aWZpY2F0aW9uIEF1dGhvcml0eTEkMCIGA1UEAxMbQ2VydHVtIFRydXN0ZWQgTmV0d29y +ayBDQSAyMCIYDzIwMTExMDA2MDgzOTU2WhgPMjA0NjEwMDYwODM5NTZaMIGAMQswCQYDVQQGEwJQ +TDEiMCAGA1UEChMZVW5pemV0byBUZWNobm9sb2dpZXMgUy5BLjEnMCUGA1UECxMeQ2VydHVtIENl +cnRpZmljYXRpb24gQXV0aG9yaXR5MSQwIgYDVQQDExtDZXJ0dW0gVHJ1c3RlZCBOZXR3b3JrIENB +IDIwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQC9+Xj45tWADGSdhhuWZGc/IjoedQF9 +7/tcZ4zJzFxrqZHmuULlIEub2pt7uZld2ZuAS9eEQCsn0+i6MLs+CRqnSZXvK0AkwpfHp+6bJe+o +CgCXhVqqndwpyeI1B+twTUrWwbNWuKFBOJvR+zF/j+Bf4bE/D44WSWDXBo0Y+aomEKsq09DRZ40b +Rr5HMNUuctHFY9rnY3lEfktjJImGLjQ/KUxSiyqnwOKRKIm5wFv5HdnnJ63/mgKXwcZQkpsCLL2p +uTRZCr+ESv/f/rOf69me4Jgj7KZrdxYq28ytOxykh9xGc14ZYmhFV+SQgkK7QtbwYeDBoz1mo130 +GO6IyY0XRSmZMnUCMe4pJshrAua1YkV/NxVaI2iJ1D7eTiew8EAMvE0Xy02isx7QBlrd9pPPV3WZ +9fqGGmd4s7+W/jTcvedSVuWz5XV710GRBdxdaeOVDUO5/IOWOZV7bIBaTxNyxtd9KXpEulKkKtVB +Rgkg/iKgtlswjbyJDNXXcPiHUv3a76xRLgezTv7QCdpw75j6VuZt27VXS9zlLCUVyJ4ueE742pye +hizKV/Ma5ciSixqClnrDvFASadgOWkaLOusm+iPJtrCBvkIApPjW/jAux9JG9uWOdf3yzLnQh1vM +BhBgu4M1t15n3kfsmUjxpKEV/q2MYo45VU85FrmxY53/twIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MB0GA1UdDgQWBBS2oVQ5AsOgP46KvPrU+Bym0ToO/TAOBgNVHQ8BAf8EBAMCAQYwDQYJKoZI +hvcNAQENBQADggIBAHGlDs7k6b8/ONWJWsQCYftMxRQXLYtPU2sQF/xlhMcQSZDe28cmk4gmb3DW +Al45oPePq5a1pRNcgRRtDoGCERuKTsZPpd1iHkTfCVn0W3cLN+mLIMb4Ck4uWBzrM9DPhmDJ2vuA +L55MYIR4PSFk1vtBHxgP58l1cb29XN40hz5BsA72udY/CROWFC/emh1auVbONTqwX3BNXuMp8SMo +clm2q8KMZiYcdywmdjWLKKdpoPk79SPdhRB0yZADVpHnr7pH1BKXESLjokmUbOe3lEu6LaTaM4tM +pkT/WjzGHWTYtTHkpjx6qFcL2+1hGsvxznN3Y6SHb0xRONbkX8eftoEq5IVIeVheO/jbAoJnwTnb +w3RLPTYe+SmTiGhbqEQZIfCn6IENLOiTNrQ3ssqwGyZ6miUfmpqAnksqP/ujmv5zMnHCnsZy4Ypo +J/HkD7TETKVhk/iXEAcqMCWpuchxuO9ozC1+9eB+D4Kob7a6bINDd82Kkhehnlt4Fj1F4jNy3eFm +ypnTycUm/Q1oBEauttmbjL4ZvrHG8hnjXALKLNhvSgfZyTXaQHXyxKcZb55CEJh15pWLYLztxRLX +is7VmFxWlgPF7ncGNf/P5O4/E2Hu29othfDNrp2yGAlFw5Khchf8R7agCyzxxN5DaAhqXzvwdmP7 +zAYspsbiDrW5viSP +-----END CERTIFICATE----- + +Hellenic Academic and Research Institutions RootCA 2015 +======================================================= +-----BEGIN CERTIFICATE----- +MIIGCzCCA/OgAwIBAgIBADANBgkqhkiG9w0BAQsFADCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcT +BkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0 +aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNVBAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNl +YXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIwMTUwHhcNMTUwNzA3MTAxMTIxWhcNNDAwNjMwMTAx +MTIxWjCBpjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0aGVuczFEMEIGA1UEChM7SGVsbGVuaWMg +QWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9ucyBDZXJ0LiBBdXRob3JpdHkxQDA+BgNV +BAMTN0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgUm9vdENBIDIw +MTUwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDC+Kk/G4n8PDwEXT2QNrCROnk8Zlrv +bTkBSRq0t89/TSNTt5AA4xMqKKYx8ZEA4yjsriFBzh/a/X0SWwGDD7mwX5nh8hKDgE0GPt+sr+eh +iGsxr/CL0BgzuNtFajT0AoAkKAoCFZVedioNmToUW/bLy1O8E00BiDeUJRtCvCLYjqOWXjrZMts+ +6PAQZe104S+nfK8nNLspfZu2zwnI5dMK/IhlZXQK3HMcXM1AsRzUtoSMTFDPaI6oWa7CJ06CojXd +FPQf/7J31Ycvqm59JCfnxssm5uX+Zwdj2EUN3TpZZTlYepKZcj2chF6IIbjV9Cz82XBST3i4vTwr +i5WY9bPRaM8gFH5MXF/ni+X1NYEZN9cRCLdmvtNKzoNXADrDgfgXy5I2XdGj2HUb4Ysn6npIQf1F +GQatJ5lOwXBH3bWfgVMS5bGMSF0xQxfjjMZ6Y5ZLKTBOhE5iGV48zpeQpX8B653g+IuJ3SWYPZK2 +fu/Z8VFRfS0myGlZYeCsargqNhEEelC9MoS+L9xy1dcdFkfkR2YgP/SWxa+OAXqlD3pk9Q0Yh9mu +iNX6hME6wGkoLfINaFGq46V3xqSQDqE3izEjR8EJCOtu93ib14L8hCCZSRm2Ekax+0VVFqmjZayc +Bw/qa9wfLgZy7IaIEuQt218FL+TwA9MmM+eAws1CoRc0CwIDAQABo0IwQDAPBgNVHRMBAf8EBTAD +AQH/MA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUcRVnyMjJvXVdctA4GGqd83EkVAswDQYJKoZI +hvcNAQELBQADggIBAHW7bVRLqhBYRjTyYtcWNl0IXtVsyIe9tC5G8jH4fOpCtZMWVdyhDBKg2mF+ +D1hYc2Ryx+hFjtyp8iY/xnmMsVMIM4GwVhO+5lFc2JsKT0ucVlMC6U/2DWDqTUJV6HwbISHTGzrM +d/K4kPFox/la/vot9L/J9UUbzjgQKjeKeaO04wlshYaT/4mWJ3iBj2fjRnRUjtkNaeJK9E10A/+y +d+2VZ5fkscWrv2oj6NSU4kQoYsRL4vDY4ilrGnB+JGGTe08DMiUNRSQrlrRGar9KC/eaj8GsGsVn +82800vpzY4zvFrCopEYq+OsS7HK07/grfoxSwIuEVPkvPuNVqNxmsdnhX9izjFk0WaSrT2y7Hxjb +davYy5LNlDhhDgcGH0tGEPEVvo2FXDtKK4F5D7Rpn0lQl033DlZdwJVqwjbDG2jJ9SrcR5q+ss7F +Jej6A7na+RZukYT1HCjI/CbM1xyQVqdfbzoEvM14iQuODy+jqk+iGxI9FghAD/FGTNeqewjBCvVt +J94Cj8rDtSvK6evIIVM4pcw72Hc3MKJP2W/R8kCtQXoXxdZKNYm3QdV8hn9VTYNKpXMgwDqvkPGa +JI7ZjnHKe7iG2rKPmT4dEw0SEe7Uq/DpFXYC5ODfqiAeW2GFZECpkJcNrVPSWh2HagCXZWK0vm9q +p/UsQu0yrbYhnr68 +-----END CERTIFICATE----- + +Hellenic Academic and Research Institutions ECC RootCA 2015 +=========================================================== +-----BEGIN CERTIFICATE----- +MIICwzCCAkqgAwIBAgIBADAKBggqhkjOPQQDAjCBqjELMAkGA1UEBhMCR1IxDzANBgNVBAcTBkF0 +aGVuczFEMEIGA1UEChM7SGVsbGVuaWMgQWNhZGVtaWMgYW5kIFJlc2VhcmNoIEluc3RpdHV0aW9u +cyBDZXJ0LiBBdXRob3JpdHkxRDBCBgNVBAMTO0hlbGxlbmljIEFjYWRlbWljIGFuZCBSZXNlYXJj +aCBJbnN0aXR1dGlvbnMgRUNDIFJvb3RDQSAyMDE1MB4XDTE1MDcwNzEwMzcxMloXDTQwMDYzMDEw +MzcxMlowgaoxCzAJBgNVBAYTAkdSMQ8wDQYDVQQHEwZBdGhlbnMxRDBCBgNVBAoTO0hlbGxlbmlj +IEFjYWRlbWljIGFuZCBSZXNlYXJjaCBJbnN0aXR1dGlvbnMgQ2VydC4gQXV0aG9yaXR5MUQwQgYD +VQQDEztIZWxsZW5pYyBBY2FkZW1pYyBhbmQgUmVzZWFyY2ggSW5zdGl0dXRpb25zIEVDQyBSb290 +Q0EgMjAxNTB2MBAGByqGSM49AgEGBSuBBAAiA2IABJKgQehLgoRc4vgxEZmGZE4JJS+dQS8KrjVP +dJWyUWRrjWvmP3CV8AVER6ZyOFB2lQJajq4onvktTpnvLEhvTCUp6NFxW98dwXU3tNf6e3pCnGoK +Vlp8aQuqgAkkbH7BRqNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0O +BBYEFLQiC4KZJAEOnLvkDv2/+5cgk5kqMAoGCCqGSM49BAMCA2cAMGQCMGfOFmI4oqxiRaeplSTA +GiecMjvAwNW6qef4BENThe5SId6d9SWDPp5YSy/XZxMOIQIwBeF1Ad5o7SofTUwJCA3sS61kFyjn +dc5FZXIhF8siQQ6ME5g4mlRtm8rifOoCWCKR +-----END CERTIFICATE----- + +Certplus Root CA G1 +=================== +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgISESBVg+QtPlRWhS2DN7cs3EYRMA0GCSqGSIb3DQEBDQUAMD4xCzAJBgNV +BAYTAkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTAe +Fw0xNDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhD +ZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMTCCAiIwDQYJKoZIhvcNAQEBBQAD +ggIPADCCAgoCggIBANpQh7bauKk+nWT6VjOaVj0W5QOVsjQcmm1iBdTYj+eJZJ+622SLZOZ5KmHN +r49aiZFluVj8tANfkT8tEBXgfs+8/H9DZ6itXjYj2JizTfNDnjl8KvzsiNWI7nC9hRYt6kuJPKNx +Qv4c/dMcLRC4hlTqQ7jbxofaqK6AJc96Jh2qkbBIb6613p7Y1/oA/caP0FG7Yn2ksYyy/yARujVj +BYZHYEMzkPZHogNPlk2dT8Hq6pyi/jQu3rfKG3akt62f6ajUeD94/vI4CTYd0hYCyOwqaK/1jpTv +LRN6HkJKHRUxrgwEV/xhc/MxVoYxgKDEEW4wduOU8F8ExKyHcomYxZ3MVwia9Az8fXoFOvpHgDm2 +z4QTd28n6v+WZxcIbekN1iNQMLAVdBM+5S//Ds3EC0pd8NgAM0lm66EYfFkuPSi5YXHLtaW6uOrc +4nBvCGrch2c0798wct3zyT8j/zXhviEpIDCB5BmlIOklynMxdCm+4kLV87ImZsdo/Rmz5yCTmehd +4F6H50boJZwKKSTUzViGUkAksnsPmBIgJPaQbEfIDbsYIC7Z/fyL8inqh3SV4EJQeIQEQWGw9CEj +jy3LKCHyamz0GqbFFLQ3ZU+V/YDI+HLlJWvEYLF7bY5KinPOWftwenMGE9nTdDckQQoRb5fc5+R+ +ob0V8rqHDz1oihYHAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0G +A1UdDgQWBBSowcCbkahDFXxdBie0KlHYlwuBsTAfBgNVHSMEGDAWgBSowcCbkahDFXxdBie0KlHY +lwuBsTANBgkqhkiG9w0BAQ0FAAOCAgEAnFZvAX7RvUz1isbwJh/k4DgYzDLDKTudQSk0YcbX8ACh +66Ryj5QXvBMsdbRX7gp8CXrc1cqh0DQT+Hern+X+2B50ioUHj3/MeXrKls3N/U/7/SMNkPX0XtPG +YX2eEeAC7gkE2Qfdpoq3DIMku4NQkv5gdRE+2J2winq14J2by5BSS7CTKtQ+FjPlnsZlFT5kOwQ/ +2wyPX1wdaR+v8+khjPPvl/aatxm2hHSco1S1cE5j2FddUyGbQJJD+tZ3VTNPZNX70Cxqjm0lpu+F +6ALEUz65noe8zDUa3qHpimOHZR4RKttjd5cUvpoUmRGywO6wT/gUITJDT5+rosuoD6o7BlXGEilX +CNQ314cnrUlZp5GrRHpejXDbl85IULFzk/bwg2D5zfHhMf1bfHEhYxQUqq/F3pN+aLHsIqKqkHWe +tUNy6mSjhEv9DKgma3GX7lZjZuhCVPnHHd/Qj1vfyDBviP4NxDMcU6ij/UgQ8uQKTuEVV/xuZDDC +VRHc6qnNSlSsKWNEz0pAoNZoWRsz+e86i9sgktxChL8Bq4fA1SCC28a5g4VCXA9DO2pJNdWY9BW/ ++mGBDAkgGNLQFwzLSABQ6XaCjGTXOqAHVcweMcDvOrRl++O/QmueD6i9a5jc2NvLi6Td11n0bt3+ +qsOR0C5CB8AMTVPNJLFMWx5R9N/pkvo= +-----END CERTIFICATE----- + +Certplus Root CA G2 +=================== +-----BEGIN CERTIFICATE----- +MIICHDCCAaKgAwIBAgISESDZkc6uo+jF5//pAq/Pc7xVMAoGCCqGSM49BAMDMD4xCzAJBgNVBAYT +AkZSMREwDwYDVQQKDAhDZXJ0cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjAeFw0x +NDA1MjYwMDAwMDBaFw0zODAxMTUwMDAwMDBaMD4xCzAJBgNVBAYTAkZSMREwDwYDVQQKDAhDZXJ0 +cGx1czEcMBoGA1UEAwwTQ2VydHBsdXMgUm9vdCBDQSBHMjB2MBAGByqGSM49AgEGBSuBBAAiA2IA +BM0PW1aC3/BFGtat93nwHcmsltaeTpwftEIRyoa/bfuFo8XlGVzX7qY/aWfYeOKmycTbLXku54uN +Am8xIk0G42ByRZ0OQneezs/lf4WbGOT8zC5y0xaTTsqZY1yhBSpsBqNjMGEwDgYDVR0PAQH/BAQD +AgEGMA8GA1UdEwEB/wQFMAMBAf8wHQYDVR0OBBYEFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMB8GA1Ud +IwQYMBaAFNqDYwJ5jtpMxjwjFNiPwyCrKGBZMAoGCCqGSM49BAMDA2gAMGUCMHD+sAvZ94OX7PNV +HdTcswYO/jOYnYs5kGuUIe22113WTNchp+e/IQ8rzfcq3IUHnQIxAIYUFuXcsGXCwI4Un78kFmjl +vPl5adytRSv3tjFzzAalU5ORGpOucGpnutee5WEaXw== +-----END CERTIFICATE----- + +OpenTrust Root CA G1 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESCzkFU5fX82bWTCp59rY45nMA0GCSqGSIb3DQEBCwUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcx +MB4XDTE0MDUyNjA4NDU1MFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzEwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQD4eUbalsUwXopxAy1wpLuwxQjczeY1wICkES3d5oeuXT2R0odsN7fa +Yp6bwiTXj/HbpqbfRm9RpnHLPhsxZ2L3EVs0J9V5ToybWL0iEA1cJwzdMOWo010hOHQX/uMftk87 +ay3bfWAfjH1MBcLrARYVmBSO0ZB3Ij/swjm4eTrwSSTilZHcYTSSjFR077F9jAHiOH3BX2pfJLKO +YheteSCtqx234LSWSE9mQxAGFiQD4eCcjsZGT44ameGPuY4zbGneWK2gDqdkVBFpRGZPTBKnjix9 +xNRbxQA0MMHZmf4yzgeEtE7NCv82TWLxp2NX5Ntqp66/K7nJ5rInieV+mhxNaMbBGN4zK1FGSxyO +9z0M+Yo0FMT7MzUj8czxKselu7Cizv5Ta01BG2Yospb6p64KTrk5M0ScdMGTHPjgniQlQ/GbI4Kq +3ywgsNw2TgOzfALU5nsaqocTvz6hdLubDuHAk5/XpGbKuxs74zD0M1mKB3IDVedzagMxbm+WG+Oi +n6+Sx+31QrclTDsTBM8clq8cIqPQqwWyTBIjUtz9GVsnnB47ev1CI9sjgBPwvFEVVJSmdz7QdFG9 +URQIOTfLHzSpMJ1ShC5VkLG631UAC9hWLbFJSXKAqWLXwPYYEQRVzXR7z2FwefR7LFxckvzluFqr +TJOVoSfupb7PcSNCupt2LQIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUl0YhVyE12jZVx/PxN3DlCPaTKbYwHwYDVR0jBBgwFoAUl0YhVyE12jZVx/Px +N3DlCPaTKbYwDQYJKoZIhvcNAQELBQADggIBAB3dAmB84DWn5ph76kTOZ0BP8pNuZtQ5iSas000E +PLuHIT839HEl2ku6q5aCgZG27dmxpGWX4m9kWaSW7mDKHyP7Rbr/jyTwyqkxf3kfgLMtMrpkZ2Cv +uVnN35pJ06iCsfmYlIrM4LvgBBuZYLFGZdwIorJGnkSI6pN+VxbSFXJfLkur1J1juONI5f6ELlgK +n0Md/rcYkoZDSw6cMoYsYPXpSOqV7XAp8dUv/TW0V8/bhUiZucJvbI/NeJWsZCj9VrDDb8O+WVLh +X4SPgPL0DTatdrOjteFkdjpY3H1PXlZs5VVZV6Xf8YpmMIzUUmI4d7S+KNfKNsSbBfD4Fdvb8e80 +nR14SohWZ25g/4/Ii+GOvUKpMwpZQhISKvqxnUOOBZuZ2mKtVzazHbYNeS2WuOvyDEsMpZTGMKcm +GS3tTAZQMPH9WD25SxdfGbRqhFS0OE85og2WaMMolP3tLR9Ka0OWLpABEPs4poEL0L9109S5zvE/ +bw4cHjdx5RiHdRk/ULlepEU0rbDK5uUTdg8xFKmOLZTW1YVNcxVPS/KyPu1svf0OnWZzsD2097+o +4BGkxK51CUpjAEggpsadCwmKtODmzj7HPiY46SvepghJAwSQiumPv+i2tCqjI40cHLI5kqiPAlxA +OXXUc0ECd97N4EOH1uS6SsNsEn/+KuYj1oxx +-----END CERTIFICATE----- + +OpenTrust Root CA G2 +==================== +-----BEGIN CERTIFICATE----- +MIIFbzCCA1egAwIBAgISESChaRu/vbm9UpaPI+hIvyYRMA0GCSqGSIb3DQEBDQUAMEAxCzAJBgNV +BAYTAkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEcy +MB4XDTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoM +CU9wZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzIwggIiMA0GCSqGSIb3DQEB +AQUAA4ICDwAwggIKAoICAQDMtlelM5QQgTJT32F+D3Y5z1zCU3UdSXqWON2ic2rxb95eolq5cSG+ +Ntmh/LzubKh8NBpxGuga2F8ORAbtp+Dz0mEL4DKiltE48MLaARf85KxP6O6JHnSrT78eCbY2albz +4e6WiWYkBuTNQjpK3eCasMSCRbP+yatcfD7J6xcvDH1urqWPyKwlCm/61UWY0jUJ9gNDlP7ZvyCV +eYCYitmJNbtRG6Q3ffyZO6v/v6wNj0OxmXsWEH4db0fEFY8ElggGQgT4hNYdvJGmQr5J1WqIP7wt +UdGejeBSzFfdNTVY27SPJIjki9/ca1TSgSuyzpJLHB9G+h3Ykst2Z7UJmQnlrBcUVXDGPKBWCgOz +3GIZ38i1MH/1PCZ1Eb3XG7OHngevZXHloM8apwkQHZOJZlvoPGIytbU6bumFAYueQ4xncyhZW+vj +3CzMpSZyYhK05pyDRPZRpOLAeiRXyg6lPzq1O4vldu5w5pLeFlwoW5cZJ5L+epJUzpM5ChaHvGOz +9bGTXOBut9Dq+WIyiET7vycotjCVXRIouZW+j1MY5aIYFuJWpLIsEPUdN6b4t/bQWVyJ98LVtZR0 +0dX+G7bw5tYee9I8y6jj9RjzIR9u701oBnstXW5DiabA+aC/gh7PU3+06yzbXfZqfUAkBXKJOAGT +y3HCOV0GEfZvePg3DTmEJwIDAQABo2MwYTAOBgNVHQ8BAf8EBAMCAQYwDwYDVR0TAQH/BAUwAwEB +/zAdBgNVHQ4EFgQUajn6QiL35okATV59M4PLuG53hq8wHwYDVR0jBBgwFoAUajn6QiL35okATV59 +M4PLuG53hq8wDQYJKoZIhvcNAQENBQADggIBAJjLq0A85TMCl38th6aP1F5Kr7ge57tx+4BkJamz +Gj5oXScmp7oq4fBXgwpkTx4idBvpkF/wrM//T2h6OKQQbA2xx6R3gBi2oihEdqc0nXGEL8pZ0keI +mUEiyTCYYW49qKgFbdEfwFFEVn8nNQLdXpgKQuswv42hm1GqO+qTRmTFAHneIWv2V6CG1wZy7HBG +S4tz3aAhdT7cHcCP009zHIXZ/n9iyJVvttN7jLpTwm+bREx50B1ws9efAvSyB7DH5fitIw6mVskp +EndI2S9G/Tvw/HRwkqWOOAgfZDC2t0v7NqwQjqBSM2OdAzVWxWm9xiNaJ5T2pBL4LTM8oValX9YZ +6e18CL13zSdkzJTaTkZQh+D5wVOAHrut+0dSixv9ovneDiK3PTNZbNTe9ZUGMg1RGUFcPk8G97kr +gCf2o6p6fAbhQ8MTOWIaNr3gKC6UAuQpLmBVrkA9sHSSXvAgZJY/X0VdiLWK2gKgW0VU3jg9CcCo +SmVGFvyqv1ROTVu+OEO3KMqLM6oaJbolXCkvW0pujOotnCr2BXbgd5eAiN1nE28daCSLT7d0geX0 +YJ96Vdc+N9oWaz53rK4YcJUIeSkDiv7BO7M/Gg+kO14fWKGVyasvc0rQLW6aWQ9VGHgtPFGml4vm +u7JwqkwR3v98KzfUetF3NI/n+UL3PIEMS1IK +-----END CERTIFICATE----- + +OpenTrust Root CA G3 +==================== +-----BEGIN CERTIFICATE----- +MIICITCCAaagAwIBAgISESDm+Ez8JLC+BUCs2oMbNGA/MAoGCCqGSM49BAMDMEAxCzAJBgNVBAYT +AkZSMRIwEAYDVQQKDAlPcGVuVHJ1c3QxHTAbBgNVBAMMFE9wZW5UcnVzdCBSb290IENBIEczMB4X +DTE0MDUyNjAwMDAwMFoXDTM4MDExNTAwMDAwMFowQDELMAkGA1UEBhMCRlIxEjAQBgNVBAoMCU9w +ZW5UcnVzdDEdMBsGA1UEAwwUT3BlblRydXN0IFJvb3QgQ0EgRzMwdjAQBgcqhkjOPQIBBgUrgQQA +IgNiAARK7liuTcpm3gY6oxH84Bjwbhy6LTAMidnW7ptzg6kjFYwvWYpa3RTqnVkrQ7cG7DK2uu5B +ta1doYXM6h0UZqNnfkbilPPntlahFVmhTzeXuSIevRHr9LIfXsMUmuXZl5mjYzBhMA4GA1UdDwEB +/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAf +BgNVHSMEGDAWgBRHd8MUi2I5DMlv4VBN0BBY3JWIbTAKBggqhkjOPQQDAwNpADBmAjEAj6jcnboM +BBf6Fek9LykBl7+BFjNAk2z8+e2AcG+qj9uEwov1NcoG3GRvaBbhj5G5AjEA2Euly8LQCGzpGPta +3U1fJAuwACEl74+nBCZx4nxp5V2a+EEfOzmTk51V6s2N8fvB +-----END CERTIFICATE----- + +ISRG Root X1 +============ +-----BEGIN CERTIFICATE----- +MIIFazCCA1OgAwIBAgIRAIIQz7DSQONZRGPgu2OCiwAwDQYJKoZIhvcNAQELBQAwTzELMAkGA1UE +BhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNoIEdyb3VwMRUwEwYDVQQD +EwxJU1JHIFJvb3QgWDEwHhcNMTUwNjA0MTEwNDM4WhcNMzUwNjA0MTEwNDM4WjBPMQswCQYDVQQG +EwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2ggR3JvdXAxFTATBgNVBAMT +DElTUkcgUm9vdCBYMTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAK3oJHP0FDfzm54r +Vygch77ct984kIxuPOZXoHj3dcKi/vVqbvYATyjb3miGbESTtrFj/RQSa78f0uoxmyF+0TM8ukj1 +3Xnfs7j/EvEhmkvBioZxaUpmZmyPfjxwv60pIgbz5MDmgK7iS4+3mX6UA5/TR5d8mUgjU+g4rk8K +b4Mu0UlXjIB0ttov0DiNewNwIRt18jA8+o+u3dpjq+sWT8KOEUt+zwvo/7V3LvSye0rgTBIlDHCN +Aymg4VMk7BPZ7hm/ELNKjD+Jo2FR3qyHB5T0Y3HsLuJvW5iB4YlcNHlsdu87kGJ55tukmi8mxdAQ +4Q7e2RCOFvu396j3x+UCB5iPNgiV5+I3lg02dZ77DnKxHZu8A/lJBdiB3QW0KtZB6awBdpUKD9jf +1b0SHzUvKBds0pjBqAlkd25HN7rOrFleaJ1/ctaJxQZBKT5ZPt0m9STJEadao0xAH0ahmbWnOlFu +hjuefXKnEgV4We0+UXgVCwOPjdAvBbI+e0ocS3MFEvzG6uBQE3xDk3SzynTnjh8BCNAw1FtxNrQH +usEwMFxIt4I7mKZ9YIqioymCzLq9gwQbooMDQaHWBfEbwrbwqHyGO0aoSCqI3Haadr8faqU9GY/r +OPNk3sgrDQoo//fb4hVC1CLQJ13hef4Y53CIrU7m2Ys6xt0nUW7/vGT1M0NPAgMBAAGjQjBAMA4G +A1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBR5tFnme7bl5AFzgAiIyBpY +9umbbjANBgkqhkiG9w0BAQsFAAOCAgEAVR9YqbyyqFDQDLHYGmkgJykIrGF1XIpu+ILlaS/V9lZL +ubhzEFnTIZd+50xx+7LSYK05qAvqFyFWhfFQDlnrzuBZ6brJFe+GnY+EgPbk6ZGQ3BebYhtF8GaV +0nxvwuo77x/Py9auJ/GpsMiu/X1+mvoiBOv/2X/qkSsisRcOj/KKNFtY2PwByVS5uCbMiogziUwt +hDyC3+6WVwW6LLv3xLfHTjuCvjHIInNzktHCgKQ5ORAzI4JMPJ+GslWYHb4phowim57iaztXOoJw +TdwJx4nLCgdNbOhdjsnvzqvHu7UrTkXWStAmzOVyyghqpZXjFaH3pO3JLF+l+/+sKAIuvtd7u+Nx +e5AW0wdeRlN8NwdCjNPElpzVmbUq4JUagEiuTDkHzsxHpFKVK7q4+63SM1N95R1NbdWhscdCb+ZA +JzVcoyi3B43njTOQ5yOf+1CceWxG1bQVs5ZufpsMljq4Ui0/1lvh+wjChP4kqKOJ2qxq4RgqsahD +YVvTH9w7jXbyLeiNdd8XM2w9U/t7y0Ff/9yi0GE44Za4rF2LN9d11TPAmRGunUHBcnWEvgJBQl9n +JEiU0Zsnvgc/ubhPgXRR4Xq37Z0j4r7g1SgEEzwxA57demyPxgcYxn/eR44/KJ4EBs+lVDR3veyJ +m+kXQ99b21/+jh5Xos1AnX5iItreGCc= +-----END CERTIFICATE----- + +AC RAIZ FNMT-RCM +================ +-----BEGIN CERTIFICATE----- +MIIFgzCCA2ugAwIBAgIPXZONMGc2yAYdGsdUhGkHMA0GCSqGSIb3DQEBCwUAMDsxCzAJBgNVBAYT +AkVTMREwDwYDVQQKDAhGTk1ULVJDTTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTAeFw0wODEw +MjkxNTU5NTZaFw0zMDAxMDEwMDAwMDBaMDsxCzAJBgNVBAYTAkVTMREwDwYDVQQKDAhGTk1ULVJD +TTEZMBcGA1UECwwQQUMgUkFJWiBGTk1ULVJDTTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBALpxgHpMhm5/yBNtwMZ9HACXjywMI7sQmkCpGreHiPibVmr75nuOi5KOpyVdWRHbNi63URcf +qQgfBBckWKo3Shjf5TnUV/3XwSyRAZHiItQDwFj8d0fsjz50Q7qsNI1NOHZnjrDIbzAzWHFctPVr +btQBULgTfmxKo0nRIBnuvMApGGWn3v7v3QqQIecaZ5JCEJhfTzC8PhxFtBDXaEAUwED653cXeuYL +j2VbPNmaUtu1vZ5Gzz3rkQUCwJaydkxNEJY7kvqcfw+Z374jNUUeAlz+taibmSXaXvMiwzn15Cou +08YfxGyqxRxqAQVKL9LFwag0Jl1mpdICIfkYtwb1TplvqKtMUejPUBjFd8g5CSxJkjKZqLsXF3mw +WsXmo8RZZUc1g16p6DULmbvkzSDGm0oGObVo/CK67lWMK07q87Hj/LaZmtVC+nFNCM+HHmpxffnT +tOmlcYF7wk5HlqX2doWjKI/pgG6BU6VtX7hI+cL5NqYuSf+4lsKMB7ObiFj86xsc3i1w4peSMKGJ +47xVqCfWS+2QrYv6YyVZLag13cqXM7zlzced0ezvXg5KkAYmY6252TUtB7p2ZSysV4999AeU14EC +ll2jB0nVetBX+RvnU0Z1qrB5QstocQjpYL05ac70r8NWQMetUqIJ5G+GR4of6ygnXYMgrwTJbFaa +i0b1AgMBAAGjgYMwgYAwDwYDVR0TAQH/BAUwAwEB/zAOBgNVHQ8BAf8EBAMCAQYwHQYDVR0OBBYE +FPd9xf3E6Jobd2Sn9R2gzL+HYJptMD4GA1UdIAQ3MDUwMwYEVR0gADArMCkGCCsGAQUFBwIBFh1o +dHRwOi8vd3d3LmNlcnQuZm5tdC5lcy9kcGNzLzANBgkqhkiG9w0BAQsFAAOCAgEAB5BK3/MjTvDD +nFFlm5wioooMhfNzKWtN/gHiqQxjAb8EZ6WdmF/9ARP67Jpi6Yb+tmLSbkyU+8B1RXxlDPiyN8+s +D8+Nb/kZ94/sHvJwnvDKuO+3/3Y3dlv2bojzr2IyIpMNOmqOFGYMLVN0V2Ue1bLdI4E7pWYjJ2cJ +j+F3qkPNZVEI7VFY/uY5+ctHhKQV8Xa7pO6kO8Rf77IzlhEYt8llvhjho6Tc+hj507wTmzl6NLrT +Qfv6MooqtyuGC2mDOL7Nii4LcK2NJpLuHvUBKwrZ1pebbuCoGRw6IYsMHkCtA+fdZn71uSANA+iW ++YJF1DngoABd15jmfZ5nc8OaKveri6E6FO80vFIOiZiaBECEHX5FaZNXzuvO+FB8TxxuBEOb+dY7 +Ixjp6o7RTUaN8Tvkasq6+yO3m/qZASlaWFot4/nUbQ4mrcFuNLwy+AwF+mWj2zs3gyLp1txyM/1d +8iC9djwj2ij3+RvrWWTV3F9yfiD8zYm1kGdNYno/Tq0dwzn+evQoFt9B9kiABdcPUXmsEKvU7ANm +5mqwujGSQkBqvjrTcuFqN1W8rB2Vt2lh8kORdOag0wokRqEIr9baRRmW1FMdW4R58MD3R++Lj8UG +rp1MYp3/RgT408m2ECVAdf4WqslKYIYvuu8wd+RU4riEmViAqhOLUTpPSPaLtrM= +-----END CERTIFICATE----- + +Amazon Root CA 1 +================ +-----BEGIN CERTIFICATE----- +MIIDQTCCAimgAwIBAgITBmyfz5m/jAo54vB4ikPmljZbyjANBgkqhkiG9w0BAQsFADA5MQswCQYD +VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAxMB4XDTE1 +MDUyNjAwMDAwMFoXDTM4MDExNzAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv +bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMTCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoC +ggEBALJ4gHHKeNXjca9HgFB0fW7Y14h29Jlo91ghYPl0hAEvrAIthtOgQ3pOsqTQNroBvo3bSMgH +FzZM9O6II8c+6zf1tRn4SWiw3te5djgdYZ6k/oI2peVKVuRF4fn9tBb6dNqcmzU5L/qwIFAGbHrQ +gLKm+a/sRxmPUDgH3KKHOVj4utWp+UhnMJbulHheb4mjUcAwhmahRWa6VOujw5H5SNz/0egwLX0t +dHA114gk957EWW67c4cX8jJGKLhD+rcdqsq08p8kDi1L93FcXmn/6pUCyziKrlA4b9v7LWIbxcce +VOF34GfID5yHI9Y/QCB/IIDEgEw+OyQmjgSubJrIqg0CAwEAAaNCMEAwDwYDVR0TAQH/BAUwAwEB +/zAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0OBBYEFIQYzIU07LwMlJQuCFmcx7IQTgoIMA0GCSqGSIb3 +DQEBCwUAA4IBAQCY8jdaQZChGsV2USggNiMOruYou6r4lK5IpDB/G/wkjUu0yKGX9rbxenDIU5PM +CCjjmCXPI6T53iHTfIUJrU6adTrCC2qJeHZERxhlbI1Bjjt/msv0tadQ1wUsN+gDS63pYaACbvXy +8MWy7Vu33PqUXHeeE6V/Uq2V8viTO96LXFvKWlJbYK8U90vvo/ufQJVtMVT8QtPHRh8jrdkPSHCa +2XV4cdFyQzR1bldZwgJcJmApzyMZFo6IQ6XU5MsI+yMRQ+hDKXJioaldXgjUkK642M4UwtBV8ob2 +xJNDd2ZhwLnoQdeXeGADbkpyrqXRfboQnoZsG4q5WTP468SQvvG5 +-----END CERTIFICATE----- + +Amazon Root CA 2 +================ +-----BEGIN CERTIFICATE----- +MIIFQTCCAymgAwIBAgITBmyf0pY1hp8KD+WGePhbJruKNzANBgkqhkiG9w0BAQwFADA5MQswCQYD +VQQGEwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAyMB4XDTE1 +MDUyNjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpv +bjEZMBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMjCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoC +ggIBAK2Wny2cSkxKgXlRmeyKy2tgURO8TW0G/LAIjd0ZEGrHJgw12MBvIITplLGbhQPDW9tK6Mj4 +kHbZW0/jTOgGNk3Mmqw9DJArktQGGWCsN0R5hYGCrVo34A3MnaZMUnbqQ523BNFQ9lXg1dKmSYXp +N+nKfq5clU1Imj+uIFptiJXZNLhSGkOQsL9sBbm2eLfq0OQ6PBJTYv9K8nu+NQWpEjTj82R0Yiw9 +AElaKP4yRLuH3WUnAnE72kr3H9rN9yFVkE8P7K6C4Z9r2UXTu/Bfh+08LDmG2j/e7HJV63mjrdvd +fLC6HM783k81ds8P+HgfajZRRidhW+mez/CiVX18JYpvL7TFz4QuK/0NURBs+18bvBt+xa47mAEx +kv8LV/SasrlX6avvDXbR8O70zoan4G7ptGmh32n2M8ZpLpcTnqWHsFcQgTfJU7O7f/aS0ZzQGPSS +btqDT6ZjmUyl+17vIWR6IF9sZIUVyzfpYgwLKhbcAS4y2j5L9Z469hdAlO+ekQiG+r5jqFoz7Mt0 +Q5X5bGlSNscpb/xVA1wf+5+9R+vnSUeVC06JIglJ4PVhHvG/LopyboBZ/1c6+XUyo05f7O0oYtlN +c/LMgRdg7c3r3NunysV+Ar3yVAhU/bQtCSwXVEqY0VThUWcI0u1ufm8/0i2BWSlmy5A5lREedCf+ +3euvAgMBAAGjQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSw +DPBMMPQFWAJI/TPlUq9LhONmUjANBgkqhkiG9w0BAQwFAAOCAgEAqqiAjw54o+Ci1M3m9Zh6O+oA +A7CXDpO8Wqj2LIxyh6mx/H9z/WNxeKWHWc8w4Q0QshNabYL1auaAn6AFC2jkR2vHat+2/XcycuUY ++gn0oJMsXdKMdYV2ZZAMA3m3MSNjrXiDCYZohMr/+c8mmpJ5581LxedhpxfL86kSk5Nrp+gvU5LE +YFiwzAJRGFuFjWJZY7attN6a+yb3ACfAXVU3dJnJUH/jWS5E4ywl7uxMMne0nxrpS10gxdr9HIcW +xkPo1LsmmkVwXqkLN1PiRnsn/eBG8om3zEK2yygmbtmlyTrIQRNg91CMFa6ybRoVGld45pIq2WWQ +gj9sAq+uEjonljYE1x2igGOpm/HlurR8FLBOybEfdF849lHqm/osohHUqS0nGkWxr7JOcQ3AWEbW +aQbLU8uz/mtBzUF+fUwPfHJ5elnNXkoOrJupmHN5fLT0zLm4BwyydFy4x2+IoZCn9Kr5v2c69BoV +Yh63n749sSmvZ6ES8lgQGVMDMBu4Gon2nL2XA46jCfMdiyHxtN/kHNGfZQIG6lzWE7OE76KlXIx3 +KadowGuuQNKotOrN8I1LOJwZmhsoVLiJkO/KdYE+HvJkJMcYr07/R54H9jVlpNMKVv/1F2Rs76gi +JUmTtt8AF9pYfl3uxRuw0dFfIRDH+fO6AgonB8Xx1sfT4PsJYGw= +-----END CERTIFICATE----- + +Amazon Root CA 3 +================ +-----BEGIN CERTIFICATE----- +MIIBtjCCAVugAwIBAgITBmyf1XSXNmY/Owua2eiedgPySjAKBggqhkjOPQQDAjA5MQswCQYDVQQG +EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSAzMB4XDTE1MDUy +NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ +MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgMzBZMBMGByqGSM49AgEGCCqGSM49AwEHA0IABCmXp8ZB +f8ANm+gBG1bG8lKlui2yEujSLtf6ycXYqm0fc4E7O5hrOXwzpcVOho6AF2hiRVd9RFgdszflZwjr +Zt6jQjBAMA8GA1UdEwEB/wQFMAMBAf8wDgYDVR0PAQH/BAQDAgGGMB0GA1UdDgQWBBSrttvXBp43 +rDCGB5Fwx5zEGbF4wDAKBggqhkjOPQQDAgNJADBGAiEA4IWSoxe3jfkrBqWTrBqYaGFy+uGh0Psc +eGCmQ5nFuMQCIQCcAu/xlJyzlvnrxir4tiz+OpAUFteMYyRIHN8wfdVoOw== +-----END CERTIFICATE----- + +Amazon Root CA 4 +================ +-----BEGIN CERTIFICATE----- +MIIB8jCCAXigAwIBAgITBmyf18G7EEwpQ+Vxe3ssyBrBDjAKBggqhkjOPQQDAzA5MQswCQYDVQQG +EwJVUzEPMA0GA1UEChMGQW1hem9uMRkwFwYDVQQDExBBbWF6b24gUm9vdCBDQSA0MB4XDTE1MDUy +NjAwMDAwMFoXDTQwMDUyNjAwMDAwMFowOTELMAkGA1UEBhMCVVMxDzANBgNVBAoTBkFtYXpvbjEZ +MBcGA1UEAxMQQW1hem9uIFJvb3QgQ0EgNDB2MBAGByqGSM49AgEGBSuBBAAiA2IABNKrijdPo1MN +/sGKe0uoe0ZLY7Bi9i0b2whxIdIA6GO9mif78DluXeo9pcmBqqNbIJhFXRbb/egQbeOc4OO9X4Ri +83BkM6DLJC9wuoihKqB1+IGuYgbEgds5bimwHvouXKNCMEAwDwYDVR0TAQH/BAUwAwEB/zAOBgNV +HQ8BAf8EBAMCAYYwHQYDVR0OBBYEFNPsxzplbszh2naaVvuc84ZtV+WBMAoGCCqGSM49BAMDA2gA +MGUCMDqLIfG9fhGt0O9Yli/W651+kI0rz2ZVwyzjKKlwCkcO8DdZEv8tmZQoTipPNU0zWgIxAOp1 +AE47xDqUEpHJWEadIRNyp4iciuRMStuW1KyLa2tJElMzrdfkviT8tQp21KW8EA== +-----END CERTIFICATE----- + +LuxTrust Global Root 2 +====================== +-----BEGIN CERTIFICATE----- +MIIFwzCCA6ugAwIBAgIUCn6m30tEntpqJIWe5rgV0xZ/u7EwDQYJKoZIhvcNAQELBQAwRjELMAkG +A1UEBhMCTFUxFjAUBgNVBAoMDUx1eFRydXN0IFMuQS4xHzAdBgNVBAMMFkx1eFRydXN0IEdsb2Jh +bCBSb290IDIwHhcNMTUwMzA1MTMyMTU3WhcNMzUwMzA1MTMyMTU3WjBGMQswCQYDVQQGEwJMVTEW +MBQGA1UECgwNTHV4VHJ1c3QgUy5BLjEfMB0GA1UEAwwWTHV4VHJ1c3QgR2xvYmFsIFJvb3QgMjCC +AiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANeFl78RmOnwYoNMPIf5U2o3C/IPPIfOb9wm +Kb3FibrJgz337spbxm1Jc7TJRqMbNBM/wYlFV/TZsfs2ZUv7COJIcRHIbjuend+JZTemhfY7RBi2 +xjcwYkSSl2l9QjAk5A0MiWtj3sXh306pFGxT4GHO9hcvHTy95iJMHZP1EMShduxq3sVs35a0VkBC +wGKSMKEtFZSg0iAGCW5qbeXrt77U8PEVfIvmTroTzEsnXpk8F12PgX8zPU/TPxvsXD/wPEx1bvKm +1Z3aLQdjAsZy6ZS8TEmVT4hSyNvoaYL4zDRbIvCGp4m9SAptZoFtyMhk+wHh9OHe2Z7d21vUKpkm +FRseTJIpgp7VkoGSQXAZ96Tlk0u8d2cx3Rz9MXANF5kM+Qw5GSoXtTBxVdUPrljhPS80m8+f9niF +wpN6cj5mj5wWEWCPnolvZ77gR1o7DJpni89Gxq44o/KnvObWhWszJHAiS8sIm7vI+AIpHb4gDEa/ +a4ebsypmQjVGbKq6rfmYe+lQVRQxv7HaLe2ArWgk+2mr2HETMOZns4dA/Yl+8kPREd8vZS9kzl8U +ubG/Mb2HeFpZZYiq/FkySIbWTLkpS5XTdvN3JW1CHDiDTf2jX5t/Lax5Gw5CMZdjpPuKadUiDTSQ +MC6otOBttpSsvItO13D8xTiOZCXhTTmQzsmHhFhxAgMBAAGjgagwgaUwDwYDVR0TAQH/BAUwAwEB +/zBCBgNVHSAEOzA5MDcGByuBKwEBAQowLDAqBggrBgEFBQcCARYeaHR0cHM6Ly9yZXBvc2l0b3J5 +Lmx1eHRydXN0Lmx1MA4GA1UdDwEB/wQEAwIBBjAfBgNVHSMEGDAWgBT/GCh2+UgFLKGu8SsbK7JT ++Et8szAdBgNVHQ4EFgQU/xgodvlIBSyhrvErGyuyU/hLfLMwDQYJKoZIhvcNAQELBQADggIBAGoZ +FO1uecEsh9QNcH7X9njJCwROxLHOk3D+sFTAMs2ZMGQXvw/l4jP9BzZAcg4atmpZ1gDlaCDdLnIN +H2pkMSCEfUmmWjfrRcmF9dTHF5kH5ptV5AzoqbTOjFu1EVzPig4N1qx3gf4ynCSecs5U89BvolbW +7MM3LGVYvlcAGvI1+ut7MV3CwRI9loGIlonBWVx65n9wNOeD4rHh4bhY79SV5GCc8JaXcozrhAIu +ZY+kt9J/Z93I055cqqmkoCUUBpvsT34tC38ddfEz2O3OuHVtPlu5mB0xDVbYQw8wkbIEa91WvpWA +VWe+2M2D2RjuLg+GLZKecBPs3lHJQ3gCpU3I+V/EkVhGFndadKpAvAefMLmx9xIX3eP/JEAdemrR +TxgKqpAd60Ae36EeRJIQmvKN4dFLRp7oRUKX6kWZ8+xm1QL68qZKJKrezrnK+T+Tb/mjuuqlPpmt +/f97mfVl7vBZKGfXkJWkE4SphMHozs51k2MavDzq1WQfLSoSOcbDWjLtR5EWDrw4wVDej8oqkDQc +7kGUnF4ZLvhFSZl0kbAEb+MEWrGrKqv+x9CWttrhSmQGbmBNvUJO/3jaJMobtNeWOWyu8Q6qp31I +iyBMz2TWuJdGsE7RKlY6oJO9r4Ak4Ap+58rVyuiFVdw2KuGUaJPHZnJED4AhMmwlxyOAgwrr +-----END CERTIFICATE----- + +TUBITAK Kamu SM SSL Kok Sertifikasi - Surum 1 +============================================= +-----BEGIN CERTIFICATE----- +MIIEYzCCA0ugAwIBAgIBATANBgkqhkiG9w0BAQsFADCB0jELMAkGA1UEBhMCVFIxGDAWBgNVBAcT +D0dlYnplIC0gS29jYWVsaTFCMEAGA1UEChM5VHVya2l5ZSBCaWxpbXNlbCB2ZSBUZWtub2xvamlr +IEFyYXN0aXJtYSBLdXJ1bXUgLSBUVUJJVEFLMS0wKwYDVQQLEyRLYW11IFNlcnRpZmlrYXN5b24g +TWVya2V6aSAtIEthbXUgU00xNjA0BgNVBAMTLVRVQklUQUsgS2FtdSBTTSBTU0wgS29rIFNlcnRp +ZmlrYXNpIC0gU3VydW0gMTAeFw0xMzExMjUwODI1NTVaFw00MzEwMjUwODI1NTVaMIHSMQswCQYD +VQQGEwJUUjEYMBYGA1UEBxMPR2ViemUgLSBLb2NhZWxpMUIwQAYDVQQKEzlUdXJraXllIEJpbGlt +c2VsIHZlIFRla25vbG9qaWsgQXJhc3Rpcm1hIEt1cnVtdSAtIFRVQklUQUsxLTArBgNVBAsTJEth +bXUgU2VydGlmaWthc3lvbiBNZXJrZXppIC0gS2FtdSBTTTE2MDQGA1UEAxMtVFVCSVRBSyBLYW11 +IFNNIFNTTCBLb2sgU2VydGlmaWthc2kgLSBTdXJ1bSAxMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8A +MIIBCgKCAQEAr3UwM6q7a9OZLBI3hNmNe5eA027n/5tQlT6QlVZC1xl8JoSNkvoBHToP4mQ4t4y8 +6Ij5iySrLqP1N+RAjhgleYN1Hzv/bKjFxlb4tO2KRKOrbEz8HdDc72i9z+SqzvBV96I01INrN3wc +wv61A+xXzry0tcXtAA9TNypN9E8Mg/uGz8v+jE69h/mniyFXnHrfA2eJLJ2XYacQuFWQfw4tJzh0 +3+f92k4S400VIgLI4OD8D62K18lUUMw7D8oWgITQUVbDjlZ/iSIzL+aFCr2lqBs23tPcLG07xxO9 +WSMs5uWk99gL7eqQQESolbuT1dCANLZGeA4fAJNG4e7p+exPFwIDAQABo0IwQDAdBgNVHQ4EFgQU +ZT/HiobGPN08VFw1+DrtUgxHV8gwDgYDVR0PAQH/BAQDAgEGMA8GA1UdEwEB/wQFMAMBAf8wDQYJ +KoZIhvcNAQELBQADggEBACo/4fEyjq7hmFxLXs9rHmoJ0iKpEsdeV31zVmSAhHqT5Am5EM2fKifh +AHe+SMg1qIGf5LgsyX8OsNJLN13qudULXjS99HMpw+0mFZx+CFOKWI3QSyjfwbPfIPP54+M638yc +lNhOT8NrF7f3cuitZjO1JVOr4PhMqZ398g26rrnZqsZr+ZO7rqu4lzwDGrpDxpa5RXI4s6ehlj2R +e37AIVNMh+3yC1SVUZPVIqUNivGTDj5UDrDYyU7c8jEyVupk+eq1nRZmQnLzf9OxMUP8pI4X8W0j +q5Rm+K37DwhuJi1/FwcJsoz7UMCflo3Ptv0AnVoUmr8CRPXBwp8iXqIPoeM= +-----END CERTIFICATE----- diff --git a/content/handlers/css/dump.c b/content/handlers/css/dump.c index 529bd4a..b12e1d9 100644 --- a/content/handlers/css/dump.c +++ b/content/handlers/css/dump.c @@ -113,6 +113,45 @@ static void dump_css_unit(FILE *stream, css_fixed val, css_unit unit) case CSS_UNIT_KHZ: fprintf(stream, "kHz"); break; + case CSS_UNIT_CAP: + fprintf(stream, "cap"); + break; + case CSS_UNIT_CH: + fprintf(stream, "ch"); + break; + case CSS_UNIT_IC: + fprintf(stream, "ic"); + break; + case CSS_UNIT_REM: + fprintf(stream, "rem"); + break; + case CSS_UNIT_LH: + fprintf(stream, "lh"); + break; + case CSS_UNIT_RLH: + fprintf(stream, "rlh"); + break; + case CSS_UNIT_VH: + fprintf(stream, "vh"); + break; + case CSS_UNIT_VW: + fprintf(stream, "vw"); + break; + case CSS_UNIT_VI: + fprintf(stream, "vi"); + break; + case CSS_UNIT_VB: + fprintf(stream, "vb"); + break; + case CSS_UNIT_VMIN: + fprintf(stream, "vmin"); + break; + case CSS_UNIT_VMAX: + fprintf(stream, "vmax"); + break; + case CSS_UNIT_Q: + fprintf(stream, "q"); + break; } } diff --git a/content/handlers/css/select.c b/content/handlers/css/select.c index 328d6a7..ee79eb3 100644 --- a/content/handlers/css/select.c +++ b/content/handlers/css/select.c @@ -278,7 +278,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n, * element's style */ error = css_computed_style_compose(ctx->parent_style, styles->styles[CSS_PSEUDO_ELEMENT_NONE], - nscss_compute_font_size, NULL, + nscss_compute_font_size, ctx, &composed); if (error != CSS_OK) { css_select_results_destroy(styles); @@ -310,7 +310,7 @@ css_select_results *nscss_get_style(nscss_select_ctx *ctx, dom_node *n, error = css_computed_style_compose( styles->styles[CSS_PSEUDO_ELEMENT_NONE], styles->styles[pseudo_element], - nscss_compute_font_size, NULL, + nscss_compute_font_size, ctx, &composed); if (error != CSS_OK) { /* TODO: perhaps this shouldn't be quite so @@ -349,7 +349,7 @@ css_computed_style *nscss_get_blank_style(nscss_select_ctx *ctx, /* TODO: Do we really need to compose? Initial style shouldn't * have any inherited properties. */ error = css_computed_style_compose(parent, partial, - nscss_compute_font_size, NULL, &composed); + nscss_compute_font_size, ctx, &composed); css_computed_style_destroy(partial); if (error != CSS_OK) { css_computed_style_destroy(composed); @@ -422,14 +422,37 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, FDIV(parent_size.value, FLTTOFIX(1.2)); size->data.length.unit = parent_size.unit; } else if (size->data.length.unit == CSS_UNIT_EM || - size->data.length.unit == CSS_UNIT_EX) { + size->data.length.unit == CSS_UNIT_EX || + size->data.length.unit == CSS_UNIT_CAP || + size->data.length.unit == CSS_UNIT_CH || + size->data.length.unit == CSS_UNIT_IC) { size->data.length.value = FMUL(size->data.length.value, parent_size.value); - if (size->data.length.unit == CSS_UNIT_EX) { + switch (size->data.length.unit) { + case CSS_UNIT_EX: /* 1ex = 0.6em in NetSurf */ size->data.length.value = FMUL(size->data.length.value, FLTTOFIX(0.6)); + break; + case CSS_UNIT_CAP: + /* Height of captals. 1cap = 0.9em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(0.9)); + break; + case CSS_UNIT_CH: + /* Width of '0'. 1ch = 0.4em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(0.4)); + break; + case CSS_UNIT_IC: + /* Width of U+6C43. 1ic = 1.1em in NetSurf. */ + size->data.length.value = FMUL(size->data.length.value, + FLTTOFIX(1.1)); + break; + default: + /* No scaling required for EM. */ + break; } size->data.length.unit = parent_size.unit; @@ -437,6 +460,25 @@ css_error nscss_compute_font_size(void *pw, const css_hint *parent, size->data.length.value = FDIV(FMUL(size->data.length.value, parent_size.value), INTTOFIX(100)); size->data.length.unit = parent_size.unit; + } else if (size->data.length.unit == CSS_UNIT_REM) { + nscss_select_ctx *ctx = pw; + if (parent == NULL) { + size->data.length.value = parent_size.value; + size->data.length.unit = parent_size.unit; + } else { + css_computed_font_size(ctx->root_style, + &parent_size.value, + &size->data.length.unit); + size->data.length.value = FMUL( + size->data.length.value, + parent_size.value); + } + } else if (size->data.length.unit == CSS_UNIT_RLH) { + /** TODO: Convert root element line-height to absolute value. */ + size->data.length.value = FMUL(size->data.length.value, FDIV( + INTTOFIX(nsoption_int(font_size)), + INTTOFIX(10))); + size->data.length.unit = CSS_UNIT_PT; } size->status = CSS_FONT_SIZE_DIMENSION; diff --git a/content/handlers/css/select.h b/content/handlers/css/select.h index abfb858..9fa6d3a 100644 --- a/content/handlers/css/select.h +++ b/content/handlers/css/select.h @@ -37,6 +37,7 @@ typedef struct nscss_select_ctx bool quirks; struct nsurl *base_url; lwc_string *universal; + const css_computed_style *root_style; const css_computed_style *parent_style; } nscss_select_ctx; diff --git a/content/handlers/css/utils.c b/content/handlers/css/utils.c index 5c7cbd9..8fe157b 100644 --- a/content/handlers/css/utils.c +++ b/content/handlers/css/utils.c @@ -27,11 +27,75 @@ /** Screen DPI in fixed point units: defaults to 90, which RISC OS uses */ css_fixed nscss_screen_dpi = F_90; + +/** + * Map viewport-relative length units to either vh or vw. + * + * Non-viewport-relative units are unchanged. + * + * \param[in] ctx Length conversion context. + * \param[in] unit Unit to map. + * \return the mapped unit. + */ +static inline css_unit css_utils__fudge_viewport_units( + const nscss_len_ctx *ctx, + css_unit unit) +{ + switch (unit) { + case CSS_UNIT_VI: + assert(ctx->root_style != NULL); + if (css_computed_writing_mode(ctx->root_style) == + CSS_WRITING_MODE_HORIZONTAL_TB) { + unit = CSS_UNIT_VW; + } else { + unit = CSS_UNIT_VH; + } + break; + case CSS_UNIT_VB: + assert(ctx->root_style != NULL); + if (css_computed_writing_mode(ctx->root_style) == + CSS_WRITING_MODE_HORIZONTAL_TB) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + case CSS_UNIT_VMIN: + if (ctx->vh < ctx->vw) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + case CSS_UNIT_VMAX: + if (ctx->vh > ctx->vw) { + unit = CSS_UNIT_VH; + } else { + unit = CSS_UNIT_VW; + } + break; + default: break; + } + + return unit; +} + /* exported interface documented in content/handlers/css/utils.h */ -css_fixed nscss_len2pt(css_fixed length, css_unit unit) +css_fixed nscss_len2pt( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit) { /* Length must not be relative */ - assert(unit != CSS_UNIT_EM && unit != CSS_UNIT_EX); + assert(unit != CSS_UNIT_EM && + unit != CSS_UNIT_EX && + unit != CSS_UNIT_CAP && + unit != CSS_UNIT_CH && + unit != CSS_UNIT_IC && + unit != CSS_UNIT_REM && + unit != CSS_UNIT_RLH); + + unit = css_utils__fudge_viewport_units(ctx, unit); switch (unit) { /* We assume the screen and any other output has the same dpi */ @@ -45,36 +109,50 @@ css_fixed nscss_len2pt(css_fixed length, css_unit unit) /* 1in = 25.4mm => 1mm = (72/25.4)pt */ case CSS_UNIT_MM: return FMUL(length, FDIV(F_72, FLTTOFIX(25.4))); + /* 1in = 101.6q => 1mm = (72/101.6)pt */ + case CSS_UNIT_Q: return FMUL(length, + FDIV(F_72, FLTTOFIX(101.6))); case CSS_UNIT_PT: return length; /* 1pc = 12pt */ case CSS_UNIT_PC: return FMUL(length, INTTOFIX(12)); + case CSS_UNIT_VH: return FDIV(FMUL(FDIV((length * ctx->vh), F_100), + F_72), nscss_screen_dpi); + case CSS_UNIT_VW: return FDIV(FMUL(FDIV((length * ctx->vw), F_100), + F_72), nscss_screen_dpi); default: break; } return 0; } - /* exported interface documented in content/handlers/css/utils.h */ -css_fixed nscss_len2px(css_fixed length, css_unit unit, +css_fixed nscss_len2px( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit, const css_computed_style *style) { /* We assume the screen and any other output has the same dpi */ css_fixed px_per_unit; - assert(style != NULL || (unit != CSS_UNIT_EM && unit != CSS_UNIT_EX)); + unit = css_utils__fudge_viewport_units(ctx, unit); switch (unit) { case CSS_UNIT_EM: case CSS_UNIT_EX: + case CSS_UNIT_CAP: + case CSS_UNIT_CH: + case CSS_UNIT_IC: { css_fixed font_size = 0; css_unit font_unit = CSS_UNIT_PT; + assert(style != NULL); + css_computed_font_size(style, &font_size, &font_unit); /* Convert to points */ - font_size = nscss_len2pt(font_size, font_unit); + font_size = nscss_len2pt(ctx, font_size, font_unit); /* Clamp to configured minimum */ if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) { @@ -85,9 +163,22 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, * 1in = 72pt => 1pt = (DPI/72)px */ px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72); - /* Scale ex units: we use a fixed ratio of 1ex = 0.6em */ - if (unit == CSS_UNIT_EX) + /* Scale non-em units to em. We have fixed ratios. */ + switch (unit) { + case CSS_UNIT_EX: px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.6)); + break; + case CSS_UNIT_CAP: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.9)); + break; + case CSS_UNIT_CH: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(0.4)); + break; + case CSS_UNIT_IC: + px_per_unit = FMUL(px_per_unit, FLTTOFIX(1.1)); + break; + default: break; + } } break; case CSS_UNIT_PX: @@ -105,6 +196,10 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, case CSS_UNIT_MM: px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(25.4)); break; + /* 1in = 101.6q => 1q = (DPI/101.6)px */ + case CSS_UNIT_Q: + px_per_unit = FDIV(nscss_screen_dpi, FLTTOFIX(101.6)); + break; /* 1in = 72pt => 1pt = (DPI/72)px */ case CSS_UNIT_PT: px_per_unit = FDIV(nscss_screen_dpi, F_72); @@ -113,6 +208,39 @@ css_fixed nscss_len2px(css_fixed length, css_unit unit, case CSS_UNIT_PC: px_per_unit = FDIV(nscss_screen_dpi, INTTOFIX(6)); break; + case CSS_UNIT_REM: + { + css_fixed font_size = 0; + css_unit font_unit = CSS_UNIT_PT; + + assert(ctx->root_style != NULL); + + css_computed_font_size(ctx->root_style, + &font_size, &font_unit); + + /* Convert to points */ + font_size = nscss_len2pt(ctx, font_size, font_unit); + + /* Clamp to configured minimum */ + if (font_size < FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10)) { + font_size = FDIV(INTTOFIX(nsoption_int(font_min_size)), F_10); + } + + /* Convert to pixels (manually, to maximise precision) + * 1in = 72pt => 1pt = (DPI/72)px */ + px_per_unit = FDIV(FMUL(font_size, nscss_screen_dpi), F_72); + break; + } + /* 1rlh = <user_font_size>pt => 1rlh = (DPI/user_font_size)px */ + case CSS_UNIT_RLH: + px_per_unit = FDIV(nscss_screen_dpi, FDIV( + INTTOFIX(nsoption_int(font_size)), + INTTOFIX(10))); + break; + case CSS_UNIT_VH: + return TRUNCATEFIX((FDIV((length * ctx->vh), F_100) + F_0_5)); + case CSS_UNIT_VW: + return TRUNCATEFIX((FDIV((length * ctx->vw), F_100) + F_0_5)); default: px_per_unit = 0; break; diff --git a/content/handlers/css/utils.h b/content/handlers/css/utils.h index 21cb497..c8f4c82 100644 --- a/content/handlers/css/utils.h +++ b/content/handlers/css/utils.h @@ -27,24 +27,54 @@ extern css_fixed nscss_screen_dpi; /** + * Length conversion context data. + */ +typedef struct nscss_len_ctx { + /** + * Viewport width in px. + * Only used if unit is vh, vw, vi, vb, vmin, or vmax. + */ + int vw; + /** + * Viewport height in px. + * Only used if unit is vh, vw, vi, vb, vmin, or vmax. + */ + int vh; + /** + * Computed style for the document root element. + * May be NULL if unit is not rem, or rlh. + */ + const css_computed_style *root_style; +} nscss_len_ctx; + +/** * Convert an absolute CSS length to points. * - * \param[in] length Absolute CSS length. - * \param[in] unit Unit of the length. + * \param[in] ctx Length conversion context. + * \param[in] length Absolute CSS length. + * \param[in] unit Unit of the length. * \return length in points */ -css_fixed nscss_len2pt(css_fixed length, css_unit unit); +css_fixed nscss_len2pt( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit); /** * Convert a CSS length to pixels. * - * \param length Length to convert - * \param unit Corresponding unit - * \param style Computed style applying to length. May be NULL if unit is - * neither em nor ex + * \param[in] ctx Length conversion context. + * \param[in] length Length to convert. + * \param[in] unit Corresponding unit. + * \param[in] style Computed style applying to length. + * May be NULL if unit is not em, ex, cap, ch, or ic. * \return length in pixels */ -css_fixed nscss_len2px(css_fixed length, css_unit unit, const css_computed_style *style); +css_fixed nscss_len2px( + const nscss_len_ctx *ctx, + css_fixed length, + css_unit unit, + const css_computed_style *style); /** diff --git a/desktop/print.c b/desktop/print.c index 54cc545..5c0333a 100644 --- a/desktop/print.c +++ b/desktop/print.c @@ -257,6 +257,11 @@ struct print_settings *print_make_settings(print_configuration configuration, struct print_settings *settings; css_fixed length = 0; css_unit unit = CSS_UNIT_MM; + nscss_len_ctx len_ctx = { + .vw = DEFAULT_PAGE_WIDTH, + .vh = DEFAULT_PAGE_HEIGHT, + .root_style = NULL, + }; switch (configuration){ case PRINT_DEFAULT: @@ -272,17 +277,17 @@ struct print_settings *print_make_settings(print_configuration configuration, settings->scale = DEFAULT_EXPORT_SCALE; length = INTTOFIX(DEFAULT_MARGIN_LEFT_MM); - settings->margins[MARGINLEFT] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINLEFT] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(DEFAULT_MARGIN_RIGHT_MM); - settings->margins[MARGINRIGHT] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINRIGHT] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(DEFAULT_MARGIN_TOP_MM); - settings->margins[MARGINTOP] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINTOP] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(DEFAULT_MARGIN_BOTTOM_MM); - settings->margins[MARGINBOTTOM] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINBOTTOM] = nscss_len2px( + &len_ctx, length, unit, NULL); break; /* use settings from the Export options tab */ case PRINT_OPTIONS: @@ -298,17 +303,17 @@ struct print_settings *print_make_settings(print_configuration configuration, settings->scale = (float)nsoption_int(export_scale) / 100; length = INTTOFIX(nsoption_int(margin_left)); - settings->margins[MARGINLEFT] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINLEFT] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(nsoption_int(margin_right)); - settings->margins[MARGINRIGHT] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINRIGHT] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(nsoption_int(margin_top)); - settings->margins[MARGINTOP] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINTOP] = nscss_len2px( + &len_ctx, length, unit, NULL); length = INTTOFIX(nsoption_int(margin_bottom)); - settings->margins[MARGINBOTTOM] = - nscss_len2px(length, unit, NULL); + settings->margins[MARGINBOTTOM] = nscss_len2px( + &len_ctx, length, unit, NULL); break; default: return NULL; diff --git a/desktop/selection.c b/desktop/selection.c index 7506af0..5cb43b8 100644 --- a/desktop/selection.c +++ b/desktop/selection.c @@ -70,18 +70,20 @@ struct selection_string { typedef bool (*seln_traverse_handler)(const char *text, size_t length, - struct box *box, void *handle, const char *whitespace_text, - size_t whitespace_length); + struct box *box, const nscss_len_ctx *len_ctx, void *handle, + const char *whitespace_text, size_t whitespace_length); -static bool redraw_handler(const char *text, size_t length, struct box *box, +static bool redraw_handler(const char *text, size_t length, + struct box *box, const nscss_len_ctx *len_ctx, void *handle, const char *whitespace_text, size_t whitespace_length); static void selection_redraw(struct selection *s, unsigned start_idx, unsigned end_idx); static bool selected_part(struct box *box, unsigned start_idx, unsigned end_idx, unsigned *start_offset, unsigned *end_offset); -static bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, +static bool traverse_tree(struct box *box, const nscss_len_ctx *len_ctx, + unsigned start_idx, unsigned end_idx, seln_traverse_handler handler, void *handle, save_text_whitespace *before, bool *first, bool do_marker); @@ -198,7 +200,10 @@ void selection_reinit(struct selection *s, struct box *root) * \param root the root box for html document or NULL for text/plain */ -void selection_init(struct selection *s, struct box *root) +void selection_init( + struct selection *s, + struct box *root, + const nscss_len_ctx *len_ctx) { if (s->defined) selection_clear(s, true); @@ -207,6 +212,13 @@ void selection_init(struct selection *s, struct box *root) s->start_idx = 0; s->end_idx = 0; s->drag_state = DRAG_NONE; + if (len_ctx != NULL) { + s->len_ctx = *len_ctx; + } else { + s->len_ctx.vw = 0; + s->len_ctx.vh = 0; + s->len_ctx.root_style = NULL; + } selection_reinit(s, root); } @@ -442,6 +454,7 @@ bool selected_part(struct box *box, unsigned start_idx, unsigned end_idx, * for all boxes that lie (partially) within the given range * * \param box box subtree + * \param len_ctx Length conversion context. * \param start_idx start of range within textual representation (bytes) * \param end_idx end of range * \param handler handler function to call @@ -452,7 +465,9 @@ bool selected_part(struct box *box, unsigned start_idx, unsigned end_idx, * \return false iff traversal abandoned part-way through */ -bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, +bool traverse_tree( + struct box *box, const nscss_len_ctx *len_ctx, + unsigned start_idx, unsigned end_idx, seln_traverse_handler handler, void *handle, save_text_whitespace *before, bool *first, bool do_marker) @@ -473,9 +488,9 @@ bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, if (box->list_marker) { /* do the marker box before continuing with the rest of the * list element */ - if (!traverse_tree(box->list_marker, start_idx, end_idx, - handler, handle, before, first, - true)) + if (!traverse_tree(box->list_marker, len_ctx, + start_idx, end_idx, handler, handle, + before, first, true)) return false; } @@ -506,7 +521,7 @@ bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, &end_offset)) { if (!handler(box->text + start_offset, min(box->length, end_offset) - start_offset, - box, handle, whitespace_text, + box, len_ctx, handle, whitespace_text, whitespace_length)) return false; if (before) { @@ -533,7 +548,7 @@ bool traverse_tree(struct box *box, unsigned start_idx, unsigned end_idx, * the tree */ struct box *next = child->next; - if (!traverse_tree(child, start_idx, end_idx, + if (!traverse_tree(child, len_ctx, start_idx, end_idx, handler, handle, before, first, false)) return false; @@ -568,14 +583,16 @@ static bool selection_traverse(struct selection *s, if (s->root) { /* HTML */ - return traverse_tree(s->root, s->start_idx, s->end_idx, - handler, handle, &before, &first, false); + return traverse_tree(s->root, &s->len_ctx, + s->start_idx, s->end_idx, + handler, handle, + &before, &first, false); } /* Text */ text = textplain_get_raw_data(s->c, s->start_idx, s->end_idx, &length); - if (text && !handler(text, length, NULL, handle, NULL, 0)) + if (text && !handler(text, length, NULL, NULL, handle, NULL, 0)) return false; return true; @@ -597,8 +614,8 @@ static bool selection_traverse(struct selection *s, */ bool redraw_handler(const char *text, size_t length, struct box *box, - void *handle, const char *whitespace_text, - size_t whitespace_length) + const nscss_len_ctx *len_ctx, void *handle, + const char *whitespace_text, size_t whitespace_length) { if (box) { struct rdw_info *r = (struct rdw_info*)handle; @@ -606,7 +623,7 @@ bool redraw_handler(const char *text, size_t length, struct box *box, int x, y; plot_font_style_t fstyle; - font_plot_style_from_css(box->style, &fstyle); + font_plot_style_from_css(len_ctx, box->style, &fstyle); /* \todo - it should be possible to reduce the redrawn area by * considering the 'text', 'length' and 'space' parameters */ @@ -652,7 +669,7 @@ void selection_redraw(struct selection *s, unsigned start_idx, unsigned end_idx) rdw.inited = false; if (s->root) { - if (!traverse_tree(s->root, start_idx, end_idx, + if (!traverse_tree(s->root, &s->len_ctx, start_idx, end_idx, redraw_handler, &rdw, NULL, NULL, false)) return; @@ -739,10 +756,11 @@ static bool selection_string_append(const char *text, size_t length, bool space, /** * Selection traversal routine for appending text to a string * - * \param text pointer to text being added, or NULL for newline - * \param length length of text to be appended (bytes) - * \param box pointer to text box, or NULL if from textplain - * \param handle selection string to append to + * \param text pointer to text being added, or NULL for newline + * \param length length of text to be appended (bytes) + * \param box pointer to text box, or NULL if from textplain + * \param len_ctx Length conversion context + * \param handle selection string to append to * \param whitespace_text whitespace to place before text for formatting * may be NULL * \param whitespace_length length of whitespace_text @@ -750,7 +768,8 @@ static bool selection_string_append(const char *text, size_t length, bool space, */ static bool selection_copy_handler(const char *text, size_t length, - struct box *box, void *handle, const char *whitespace_text, + struct box *box, const nscss_len_ctx *len_ctx, + void *handle, const char *whitespace_text, size_t whitespace_length) { bool add_space = false; @@ -771,7 +790,7 @@ static bool selection_copy_handler(const char *text, size_t length, if (box->style != NULL) { /* Override default font style */ - font_plot_style_from_css(box->style, &style); + font_plot_style_from_css(len_ctx, box->style, &style); pstyle = &style; } else { /* If there's no style, there must be no text */ diff --git a/desktop/selection.h b/desktop/selection.h index e2bc3b3..2f3f6dc 100644 --- a/desktop/selection.h +++ b/desktop/selection.h @@ -25,6 +25,7 @@ #include <stdbool.h> #include "netsurf/mouse.h" +#include "content/handlers/css/utils.h" struct box; @@ -43,6 +44,7 @@ struct selection { struct content *c; struct box *root; + nscss_len_ctx len_ctx; unsigned max_idx; /* total bytes in text representation */ @@ -60,7 +62,10 @@ struct selection *selection_create(struct content *c, bool is_html); void selection_prepare(struct selection *s, struct content *c, bool is_html); void selection_destroy(struct selection *s); -void selection_init(struct selection *s, struct box *root); +void selection_init( + struct selection *s, + struct box *root, + const nscss_len_ctx *len_ctx); void selection_reinit(struct selection *s, struct box *root); /* struct box *selection_root(struct selection *s); */ diff --git a/desktop/textarea.c b/desktop/textarea.c index 149ca26..3fd4c98 100644 --- a/desktop/textarea.c +++ b/desktop/textarea.c @@ -1803,6 +1803,10 @@ static void textarea_setup_text_offsets(struct textarea *ta) { int text_y_offset, text_y_offset_baseline; + ta->line_height = FIXTOINT(FMUL(FLTTOFIX(1.3), FDIV(FMUL( + nscss_screen_dpi, FDIV(INTTOFIX(ta->fstyle.size), + INTTOFIX(FONT_SIZE_SCALE))), F_72))); + text_y_offset = text_y_offset_baseline = ta->border_width; if (ta->flags & TEXTAREA_MULTILINE) { /* Multiline textarea */ @@ -1822,6 +1826,27 @@ static void textarea_setup_text_offsets(struct textarea *ta) } +/** + * Set font styles up for a textarea. + * + * \param[in] ta Textarea to update. + * \param[in] fstyle Font style to set in textarea. + * \param[in] selected_text Textarea selected text colour. + * \param[in] selected_bg Textarea selection background colour. + */ +static void textarea_set_text_style( + struct textarea *ta, + const plot_font_style_t *fstyle, + colour selected_text, + colour selected_bg) +{ + ta->fstyle = *fstyle; + + ta->sel_fstyle = *fstyle; + ta->sel_fstyle.foreground = selected_text; + ta->sel_fstyle.background = selected_bg; +} + /* exported interface, documented in textarea.h */ struct textarea *textarea_create(const textarea_flags flags, @@ -1861,11 +1886,10 @@ struct textarea *textarea_create(const textarea_flags flags, ret->border_width = setup->border_width; ret->border_col = setup->border_col; - ret->fstyle = setup->text; - - ret->sel_fstyle = setup->text; - ret->sel_fstyle.foreground = setup->selected_text; - ret->sel_fstyle.background = setup->selected_bg; + textarea_set_text_style(ret, + &setup->text, + setup->selected_text, + setup->selected_bg); ret->scroll_x = 0; ret->scroll_y = 0; @@ -3220,8 +3244,12 @@ void textarea_set_dimensions(struct textarea *ta, int width, int height) /* exported interface, documented in textarea.h */ -void textarea_set_layout(struct textarea *ta, int width, int height, - int top, int right, int bottom, int left) +void textarea_set_layout( + struct textarea *ta, + const plot_font_style_t *fstyle, + int width, int height, + int top, int right, + int bottom, int left) { struct rect r = {0, 0, 0, 0}; @@ -3232,6 +3260,10 @@ void textarea_set_layout(struct textarea *ta, int width, int height, ta->pad_bottom = bottom + ((ta->bar_x == NULL) ? 0 : SCROLLBAR_WIDTH); ta->pad_left = left; + textarea_set_text_style(ta, fstyle, + ta->sel_fstyle.foreground, + ta->sel_fstyle.background); + textarea_setup_text_offsets(ta); if (ta->flags & TEXTAREA_MULTILINE) { diff --git a/desktop/textarea.h b/desktop/textarea.h index b386e50..82e0de9 100644 --- a/desktop/textarea.h +++ b/desktop/textarea.h @@ -329,8 +329,12 @@ void textarea_set_dimensions(struct textarea *ta, int width, int height); * \param bottom the new bottom padding of the textarea * \param left the new left padding of the textarea */ -void textarea_set_layout(struct textarea *ta, int width, int height, - int top, int right, int bottom, int left); +void textarea_set_layout( + struct textarea *ta, + const plot_font_style_t *fstyle, + int width, int height, + int top, int right, + int bottom, int left); /** diff --git a/render/box.c b/render/box.c index 8b9c89e..c97e898 100644 --- a/render/box.c +++ b/render/box.c @@ -342,20 +342,27 @@ void box_bounds(struct box *box, struct rect *r) /** * Determine if a point lies within a box. * - * \param box box to consider - * \param x coordinate relative to box - * \param y coordinate relative to box - * \param physically if function returning true, physically is set true if - * point is within the box's physical dimensions and false - * if the point is not within the box's physical dimensions - * but is in the area defined by the box's descendants. - * if function returning false, physically is undefined. + * \param[in] len_ctx CSS length conversion context to use. + * \param[in] box Box to consider + * \param[in] x Coordinate relative to box + * \param[in] y Coordinate relative to box + * \param[out] physically If function returning true, physically is set true + * iff point is within the box's physical dimensions and + * false if the point is not within the box's physical + * dimensions but is in the area defined by the box's + * descendants. If function returns false, physically + * is undefined. * \return true if the point is within the box or a descendant box * * This is a helper function for box_at_point(). */ -static bool box_contains_point(struct box *box, int x, int y, bool *physically) +static bool box_contains_point( + const nscss_len_ctx *len_ctx, + const struct box *box, + int x, + int y, + bool *physically) { css_computed_clip_rect css_rect; @@ -382,25 +389,25 @@ static bool box_contains_point(struct box *box, int x, int y, bool *physically) /* Adjust rect to css clip region */ if (css_rect.left_auto == false) { - r.x0 += FIXTOINT(nscss_len2px( + r.x0 += FIXTOINT(nscss_len2px(len_ctx, css_rect.left, css_rect.lunit, box->style)); } if (css_rect.top_auto == false) { - r.y0 += FIXTOINT(nscss_len2px( + r.y0 += FIXTOINT(nscss_len2px(len_ctx, css_rect.top, css_rect.tunit, box->style)); } if (css_rect.right_auto == false) { r.x1 = box->border[LEFT].width + - FIXTOINT(nscss_len2px( + FIXTOINT(nscss_len2px(len_ctx, css_rect.right, css_rect.runit, box->style)); } if (css_rect.bottom_auto == false) { r.y1 = box->border[TOP].width + - FIXTOINT(nscss_len2px( + FIXTOINT(nscss_len2px(len_ctx, css_rect.bottom, css_rect.bunit, box->style)); @@ -659,6 +666,7 @@ skip_children: /** * Find the boxes at a point. * + * \param len_ctx CSS length conversion context for document. * \param box box to search children of * \param x point to find, in global document coordinates * \param y point to find, in global document coordinates @@ -674,13 +682,14 @@ skip_children: * struct box *box = top_of_document_to_search; * int box_x = 0, box_y = 0; * - * while ((box = box_at_point(box, x, y, &box_x, &box_y))) { + * while ((box = box_at_point(len_ctx, box, x, y, &box_x, &box_y))) { * // process box * } * \endcode */ -struct box *box_at_point(struct box *box, const int x, const int y, +struct box *box_at_point(const nscss_len_ctx *len_ctx, + struct box *box, const int x, const int y, int *box_x, int *box_y) { bool skip_children; @@ -690,7 +699,7 @@ struct box *box_at_point(struct box *box, const int x, const int y, skip_children = false; while ((box = box_next_xy(box, box_x, box_y, skip_children))) { - if (box_contains_point(box, x - *box_x, y - *box_y, + if (box_contains_point(len_ctx, box, x - *box_x, y - *box_y, &physically)) { *box_x -= scrollbar_get_offset(box->scroll_x); *box_y -= scrollbar_get_offset(box->scroll_y); diff --git a/render/box.h b/render/box.h index 2800d40..1af0a8b 100644 --- a/render/box.h +++ b/render/box.h @@ -91,6 +91,8 @@ #include <stdio.h> #include <libcss/libcss.h> +#include "content/handlers/css/utils.h" + struct content; struct box; struct browser_window; @@ -328,7 +330,9 @@ void box_free(struct box *box); void box_free_box(struct box *box); void box_bounds(struct box *box, struct rect *r); void box_coords(struct box *box, int *x, int *y); -struct box *box_at_point(struct box *box, const int x, const int y, +struct box *box_at_point( + const nscss_len_ctx *len_ctx, + struct box *box, const int x, const int y, int *box_x, int *box_y); struct box *box_pick_text_box(struct html_content *html, int x, int y, int dir, int *dx, int *dy); @@ -356,6 +360,9 @@ bool box_hscrollbar_present(const struct box *box); nserror dom_to_box(struct dom_node *n, struct html_content *c, box_construct_complete_cb cb); -bool box_normalise_block(struct box *block, struct html_content *c); +bool box_normalise_block( + struct box *block, + const struct box *root, + struct html_content *c); #endif diff --git a/render/box_construct.c b/render/box_construct.c index 1982622..1aa99e2 100644 --- a/render/box_construct.c +++ b/render/box_construct.c @@ -104,7 +104,8 @@ static bool box_construct_element(struct box_construct_ctx *ctx, static void box_construct_element_after(dom_node *n, html_content *content); static bool box_construct_text(struct box_construct_ctx *ctx); static css_select_results * box_get_style(html_content *c, - const css_computed_style *parent_style, dom_node *n); + const css_computed_style *parent_style, + const css_computed_style *root_style, dom_node *n); static void box_text_transform(char *s, unsigned int len, enum css_text_transform_e tt); #define BOX_SPECIAL_PARAMS dom_node *n, html_content *content, \ @@ -429,7 +430,8 @@ void convert_xml_to_box(struct box_construct_ctx *ctx) root.children->parent = &root; /** \todo Remove box_normalise_block */ - if (box_normalise_block(&root, ctx->content) == false) { + if (box_normalise_block(&root, ctx->root_box, + ctx->content) == false) { ctx->cb(ctx->content, false); } else { ctx->content->layout = root.children; @@ -741,6 +743,7 @@ bool box_construct_element(struct box_construct_ctx *ctx, lwc_string *bgimage_uri; dom_exception err; struct box_construct_props props; + const css_computed_style *root_style = NULL; assert(ctx->n != NULL); @@ -753,7 +756,12 @@ bool box_construct_element(struct box_construct_ctx *ctx, props.containing_block->flags &= ~PRE_STRIP; } - styles = box_get_style(ctx->content, props.parent_style, ctx->n); + if (props.node_is_root == false) { + root_style = ctx->root_box->style; + } + + styles = box_get_style(ctx->content, props.parent_style, root_style, + ctx->n); if (styles == NULL) return false; @@ -1321,13 +1329,15 @@ bool box_construct_text(struct box_construct_ctx *ctx) /** * Get the style for an element. * - * \param c content of type CONTENT_HTML that is being processed + * \param c content of type CONTENT_HTML that is being processed * \param parent_style style at this point in xml tree, or NULL for root - * \param n node in xml tree + * \param root_style root node's style, or NULL for root + * \param n node in xml tree * \return the new style, or NULL on memory exhaustion */ css_select_results *box_get_style(html_content *c, - const css_computed_style *parent_style, dom_node *n) + const css_computed_style *parent_style, + const css_computed_style *root_style, dom_node *n) { dom_string *s; dom_exception err; @@ -1359,6 +1369,7 @@ css_select_results *box_get_style(html_content *c, ctx.quirks = (c->quirks == DOM_DOCUMENT_QUIRKS_MODE_FULL); ctx.base_url = c->base_url; ctx.universal = c->universal; + ctx.root_style = root_style; ctx.parent_style = parent_style; /* Select style for element */ diff --git a/render/box_normalise.c b/render/box_normalise.c index 9f78f75..8da2457 100644 --- a/render/box_normalise.c +++ b/render/box_normalise.c @@ -65,24 +65,38 @@ struct columns { }; -static bool box_normalise_table(struct box *table, html_content *c); -static bool box_normalise_table_spans(struct box *table, - struct span_info *spans, html_content *c); -static bool box_normalise_table_row_group(struct box *row_group, +static bool box_normalise_table( + struct box *table, + const struct box *root, + html_content *c); +static bool box_normalise_table_spans( + struct box *table, + const struct box *root, + struct span_info *spans, + html_content *c); +static bool box_normalise_table_row_group( + struct box *row_group, + const struct box *root, struct columns *col_info, html_content *c); -static bool box_normalise_table_row(struct box *row, +static bool box_normalise_table_row( + struct box *row, + const struct box *root, struct columns *col_info, html_content *c); static bool calculate_table_row(struct columns *col_info, unsigned int col_span, unsigned int row_span, unsigned int *start_column, struct box *cell); -static bool box_normalise_inline_container(struct box *cont, html_content *c); +static bool box_normalise_inline_container( + struct box *cont, + const struct box *root, + html_content *c); /** * Ensure the box tree is correctly nested by adding and removing nodes. * * \param block box of type BLOCK, INLINE_BLOCK, or TABLE_CELL + * \param root root box of document * \param c content of boxes * \return true on success, false on memory exhaustion * @@ -100,7 +114,10 @@ static bool box_normalise_inline_container(struct box *cont, html_content *c); * \endcode */ -bool box_normalise_block(struct box *block, html_content *c) +bool box_normalise_block( + struct box *block, + const struct box *root, + html_content *c) { struct box *child; struct box *next_child; @@ -109,6 +126,9 @@ bool box_normalise_block(struct box *block, html_content *c) nscss_select_ctx ctx; assert(block != NULL); + assert(root != NULL); + + ctx.root_style = root->style; #ifdef BOX_NORMALISE_DEBUG NSLOG(netsurf, INFO, "block %p, block->type %u", block, block->type); @@ -128,15 +148,15 @@ bool box_normalise_block(struct box *block, html_content *c) switch (child->type) { case BOX_BLOCK: /* ok */ - if (box_normalise_block(child, c) == false) + if (box_normalise_block(child, root, c) == false) return false; break; case BOX_INLINE_CONTAINER: - if (box_normalise_inline_container(child, c) == false) + if (box_normalise_inline_container(child, root, c) == false) return false; break; case BOX_TABLE: - if (box_normalise_table(child, c) == false) + if (box_normalise_table(child, root, c) == false) return false; break; case BOX_INLINE: @@ -199,7 +219,7 @@ bool box_normalise_block(struct box *block, html_content *c) block->last = table; table->parent = block; - if (box_normalise_table(table, c) == false) + if (box_normalise_table(table, root, c) == false) return false; break; default: @@ -211,7 +231,10 @@ bool box_normalise_block(struct box *block, html_content *c) } -bool box_normalise_table(struct box *table, html_content * c) +bool box_normalise_table( + struct box *table, + const struct box *root, + html_content * c) { struct box *child; struct box *next_child; @@ -223,6 +246,8 @@ bool box_normalise_table(struct box *table, html_content * c) assert(table != NULL); assert(table->type == BOX_TABLE); + ctx.root_style = root->style; + #ifdef BOX_NORMALISE_DEBUG NSLOG(netsurf, INFO, "table %p", table); #endif @@ -243,7 +268,7 @@ bool box_normalise_table(struct box *table, html_content * c) switch (child->type) { case BOX_TABLE_ROW_GROUP: /* ok */ - if (box_normalise_table_row_group(child, + if (box_normalise_table_row_group(child, root, &col_info, c) == false) { free(col_info.spans); return false; @@ -308,7 +333,7 @@ bool box_normalise_table(struct box *table, html_content * c) table->last = row_group; row_group->parent = table; - if (box_normalise_table_row_group(row_group, + if (box_normalise_table_row_group(row_group, root, &col_info, c) == false) { free(col_info.spans); return false; @@ -390,16 +415,13 @@ bool box_normalise_table(struct box *table, html_content * c) table->rows = 1; } - if (box_normalise_table_spans(table, col_info.spans, c) == false) { + if (box_normalise_table_spans(table, root, col_info.spans, c) == false) { free(col_info.spans); return false; } free(col_info.spans); - if (table_calculate_column_types(table) == false) - return false; - #ifdef BOX_NORMALISE_DEBUG NSLOG(netsurf, INFO, "table %p done", table); #endif @@ -413,12 +435,16 @@ bool box_normalise_table(struct box *table, html_content * c) * Additionally, generate empty cells. * * \param table Table to process + * \param root root box of document * \param spans Array of length table->columns for use in empty cell detection * \param c Content containing table * \return True on success, false on memory exhaustion. */ -bool box_normalise_table_spans(struct box *table, struct span_info *spans, +bool box_normalise_table_spans( + struct box *table, + const struct box *root, + struct span_info *spans, html_content *c) { struct box *table_row_group; @@ -429,6 +455,8 @@ bool box_normalise_table_spans(struct box *table, struct span_info *spans, unsigned int col; nscss_select_ctx ctx; + ctx.root_style = root->style; + /* Clear span data */ memset(spans, 0, table->columns * sizeof(struct span_info)); @@ -572,7 +600,9 @@ bool box_normalise_table_spans(struct box *table, struct span_info *spans, } -bool box_normalise_table_row_group(struct box *row_group, +bool box_normalise_table_row_group( + struct box *row_group, + const struct box *root, struct columns *col_info, html_content * c) { @@ -586,6 +616,8 @@ bool box_normalise_table_row_group(struct box *row_group, assert(row_group != 0); assert(row_group->type == BOX_TABLE_ROW_GROUP); + ctx.root_style = root->style; + #ifdef BOX_NORMALISE_DEBUG NSLOG(netsurf, INFO, "row_group %p", row_group); #endif @@ -597,7 +629,7 @@ bool box_normalise_table_row_group(struct box *row_group, case BOX_TABLE_ROW: /* ok */ group_row_count++; - if (box_normalise_table_row(child, col_info, + if (box_normalise_table_row(child, root, col_info, c) == false) return false; break; @@ -657,7 +689,7 @@ bool box_normalise_table_row_group(struct box *row_group, row->parent = row_group; group_row_count++; - if (box_normalise_table_row(row, col_info, + if (box_normalise_table_row(row, root, col_info, c) == false) return false; break; @@ -722,7 +754,9 @@ bool box_normalise_table_row_group(struct box *row_group, } -bool box_normalise_table_row(struct box *row, +bool box_normalise_table_row( + struct box *row, + const struct box *root, struct columns *col_info, html_content * c) { @@ -736,6 +770,8 @@ bool box_normalise_table_row(struct box *row, assert(row != NULL); assert(row->type == BOX_TABLE_ROW); + ctx.root_style = root->style; + #ifdef BOX_NORMALISE_DEBUG NSLOG(netsurf, INFO, "row %p", row); #endif @@ -746,7 +782,7 @@ bool box_normalise_table_row(struct box *row, switch (child->type) { case BOX_TABLE_CELL: /* ok */ - if (box_normalise_block(child, c) == false) + if (box_normalise_block(child, root, c) == false) return false; cell = child; break; @@ -805,7 +841,7 @@ bool box_normalise_table_row(struct box *row, row->last = cell; cell->parent = row; - if (box_normalise_block(cell, c) == false) + if (box_normalise_block(cell, root, c) == false) return false; break; case BOX_INLINE: @@ -928,7 +964,10 @@ bool calculate_table_row(struct columns *col_info, } -bool box_normalise_inline_container(struct box *cont, html_content * c) +bool box_normalise_inline_container( + struct box *cont, + const struct box *root, + html_content * c) { struct box *child; struct box *next_child; @@ -951,7 +990,7 @@ bool box_normalise_inline_container(struct box *cont, html_content * c) break; case BOX_INLINE_BLOCK: /* ok */ - if (box_normalise_block(child, c) == false) + if (box_normalise_block(child, root, c) == false) return false; break; case BOX_FLOAT_LEFT: @@ -961,12 +1000,12 @@ bool box_normalise_inline_container(struct box *cont, html_content * c) switch (child->children->type) { case BOX_BLOCK: - if (box_normalise_block(child->children, + if (box_normalise_block(child->children, root, c) == false) return false; break; case BOX_TABLE: - if (box_normalise_table(child->children, + if (box_normalise_table(child->children, root, c) == false) return false; break; diff --git a/render/box_textarea.c b/render/box_textarea.c index 3b1e775..a609842 100644 --- a/render/box_textarea.c +++ b/render/box_textarea.c @@ -239,7 +239,14 @@ bool box_textarea_create_textarea(html_content *html, dom_exception err; textarea_setup ta_setup; textarea_flags ta_flags; - plot_font_style_t fstyle; + plot_font_style_t fstyle = { + .family = PLOT_FONT_FAMILY_SANS_SERIF, + .size = 10 * FONT_SIZE_SCALE, + .weight = 400, + .flags = FONTF_NONE, + .background = 0, + .foreground = 0, + }; bool read_only = false; bool disabled = false; struct form_control *gadget = box->gadget; @@ -307,8 +314,6 @@ bool box_textarea_create_textarea(html_content *html, gadget->data.text.data.gadget = gadget; - font_plot_style_from_css(gadget->box->style, &fstyle); - /* Reset to correct values by layout */ ta_setup.width = 200; ta_setup.height = 20; diff --git a/render/font.c b/render/font.c index 94ef877..a769b47 100644 --- a/render/font.c +++ b/render/font.c @@ -131,8 +131,10 @@ static plot_font_flags_t plot_font_flags(enum css_font_style_e style, } -/* exported function documented in render/font_internal.h */ -void font_plot_style_from_css(const css_computed_style *css, +/* exported function documented in render/font.h */ +void font_plot_style_from_css( + const nscss_len_ctx *len_ctx, + const css_computed_style *css, plot_font_style_t *fstyle) { lwc_string **families; @@ -144,7 +146,7 @@ void font_plot_style_from_css(const css_computed_style *css, css_computed_font_family(css, &families)); css_computed_font_size(css, &length, &unit); - fstyle->size = FIXTOINT(FMUL(nscss_len2pt(length, unit), + fstyle->size = FIXTOINT(FMUL(nscss_len2pt(len_ctx, length, unit), INTTOFIX(FONT_SIZE_SCALE))); /* Clamp font size to configured minimum */ diff --git a/render/font.h b/render/font.h index fba368a..52f5a62 100644 --- a/render/font.h +++ b/render/font.h @@ -32,10 +32,13 @@ struct plot_font_style; /** * Populate a font style using data from a computed CSS style * - * \param css Computed style to consider - * \param fstyle Font style to populate + * \param len_ctx Length conversion context + * \param css Computed style to consider + * \param fstyle Font style to populate */ -void font_plot_style_from_css(const css_computed_style *css, - struct plot_font_style *fstyle); +void font_plot_style_from_css( + const nscss_len_ctx *len_ctx, + const css_computed_style *css, + struct plot_font_style *fstyle); #endif diff --git a/render/form.c b/render/form.c index 904272d..4320025 100644 --- a/render/form.c +++ b/render/form.c @@ -1133,6 +1133,7 @@ bool form_open_select_menu(void *client_data, plot_font_style_t fstyle; int total_height; struct form_select_menu *menu; + html_content *html = (html_content *)c; /* if the menu is opened for the first time */ @@ -1153,7 +1154,7 @@ bool form_open_select_menu(void *client_data, box->border[LEFT].width + box->padding[RIGHT] + box->padding[LEFT]; - font_plot_style_from_css(control->box->style, + font_plot_style_from_css(&html->len_ctx, control->box->style, &fstyle); menu->f_size = fstyle.size; diff --git a/render/html.c b/render/html.c index 3cfc5e2..b7d7aa3 100644 --- a/render/html.c +++ b/render/html.c @@ -1398,6 +1398,10 @@ static void html_reformat(struct content *c, int width, int height) htmlc->reflowing = true; + htmlc->len_ctx.vw = width; + htmlc->len_ctx.vh = height; + htmlc->len_ctx.root_style = htmlc->layout->style; + layout_document(htmlc, width, height); layout = htmlc->layout; @@ -1647,7 +1651,7 @@ html_open(struct content *c, html->drag_owner.no_owner = true; /* text selection */ - selection_init(&html->sel, html->layout); + selection_init(&html->sel, html->layout, &html->len_ctx); html->selection_type = HTML_SELECTION_NONE; html->selection_owner.none = true; @@ -1768,7 +1772,8 @@ html_get_contextual_content(struct content *c, int x, int y, struct box *next; int box_x = 0, box_y = 0; - while ((next = box_at_point(box, x, y, &box_x, &box_y)) != NULL) { + while ((next = box_at_point(&html->len_ctx, box, x, y, + &box_x, &box_y)) != NULL) { box = next; /* hidden boxes are ignored */ @@ -1845,7 +1850,8 @@ html_scroll_at_point(struct content *c, int x, int y, int scrx, int scry) /* TODO: invert order; visit deepest box first */ - while ((next = box_at_point(box, x, y, &box_x, &box_y)) != NULL) { + while ((next = box_at_point(&html->len_ctx, box, x, y, + &box_x, &box_y)) != NULL) { box = next; if (box->style && css_computed_visibility(box->style) == @@ -1987,7 +1993,8 @@ static bool html_drop_file_at_point(struct content *c, int x, int y, char *file) int box_x = 0, box_y = 0; /* Scan box tree for boxes that can handle drop */ - while ((next = box_at_point(box, x, y, &box_x, &box_y)) != NULL) { + while ((next = box_at_point(&html->len_ctx, box, x, y, + &box_x, &box_y)) != NULL) { box = next; if (box->style && css_computed_visibility(box->style) == diff --git a/render/html_interaction.c b/render/html_interaction.c index 30adaa0..2d14ed2 100644 --- a/render/html_interaction.c +++ b/render/html_interaction.c @@ -208,7 +208,7 @@ static size_t html_selection_drag_end(struct html_content *html, if (box) { plot_font_style_t fstyle; - font_plot_style_from_css(box->style, &fstyle); + font_plot_style_from_css(&html->len_ctx, box->style, &fstyle); guit->layout->position(&fstyle, box->text, box->length, dx, &idx, &pixel_offset); @@ -415,7 +415,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw, size_t idx; plot_font_style_t fstyle; - font_plot_style_from_css(box->style, &fstyle); + font_plot_style_from_css(&html->len_ctx, + box->style, &fstyle); guit->layout->position(&fstyle, box->text, box->length, @@ -649,7 +650,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw, text_box = box; text_box_x = box_x; } - } while ((box = box_at_point(box, x, y, &box_x, &box_y)) != NULL); + } while ((box = box_at_point(&html->len_ctx, box, x, y, + &box_x, &box_y)) != NULL); /* use of box_x, box_y, or content below this point is probably a * mistake; they will refer to the last box returned by box_at_point */ @@ -910,8 +912,8 @@ void html_mouse_action(struct content *c, struct browser_window *bw, int pixel_offset; size_t idx; - font_plot_style_from_css(text_box->style, - &fstyle); + font_plot_style_from_css(&html->len_ctx, + text_box->style, &fstyle); guit->layout->position(&fstyle, text_box->text, diff --git a/render/html_internal.h b/render/html_internal.h index 2f84cf8..66ecb2b 100644 --- a/render/html_internal.h +++ b/render/html_internal.h @@ -26,6 +26,7 @@ #include <libcss/libcss.h> +#include "content/handlers/css/utils.h" #include "content/content_protected.h" #include "desktop/selection.h" #include "render/html.h" @@ -94,6 +95,9 @@ typedef struct html_content { /** Base target */ char *base_target; + /** CSS length conversion context for document. */ + nscss_len_ctx len_ctx; + /** Content has been aborted in the LOADING state */ bool aborted; diff --git a/render/html_object.c b/render/html_object.c index e98bdba..fb9e7b0 100644 --- a/render/html_object.c +++ b/render/html_object.c @@ -227,7 +227,8 @@ html_object_callback(hlcache_handle *object, if (hunit == CSS_UNIT_PCT) { l = (width - w) * hpos / INTTOFIX(100); } else { - l = FIXTOINT(nscss_len2px(hpos, hunit, + l = FIXTOINT(nscss_len2px(&c->len_ctx, + hpos, hunit, box->style)); } @@ -235,7 +236,8 @@ html_object_callback(hlcache_handle *object, if (vunit == CSS_UNIT_PCT) { t = (height - h) * vpos / INTTOFIX(100); } else { - t = FIXTOINT(nscss_len2px(vpos, vunit, + t = FIXTOINT(nscss_len2px(&c->len_ctx, + vpos, vunit, box->style)); } diff --git a/render/html_redraw.c b/render/html_redraw.c index 2f87306..9a97e5e 100644 --- a/render/html_redraw.c +++ b/render/html_redraw.c @@ -521,12 +521,14 @@ static bool html_redraw_radio(int x, int y, int width, int height, * \param box box of input * \param scale scale for redraw * \param background_colour current background colour + * \param len_ctx Length conversion context * \param ctx current redraw context * \return true if successful, false otherwise */ static bool html_redraw_file(int x, int y, int width, int height, struct box *box, float scale, colour background_colour, + const nscss_len_ctx *len_ctx, const struct redraw_context *ctx) { int text_width; @@ -535,7 +537,7 @@ static bool html_redraw_file(int x, int y, int width, int height, plot_font_style_t fstyle; nserror res; - font_plot_style_from_css(box->style, &fstyle); + font_plot_style_from_css(len_ctx, box->style, &fstyle); fstyle.background = background_colour; if (box->gadget->value) { @@ -578,13 +580,16 @@ static bool html_redraw_file(int x, int y, int width, int height, * \param clip current clip rectangle * \param background_colour current background colour * \param background box containing background details (usually \a box) - * \param ctx current redraw context + * \param len_ctx Length conversion context + * \param ctx current redraw context * \return true if successful, false otherwise */ static bool html_redraw_background(int x, int y, struct box *box, float scale, const struct rect *clip, colour *background_colour, - struct box *background, const struct redraw_context *ctx) + struct box *background, + const nscss_len_ctx *len_ctx, + const struct redraw_context *ctx) { bool repeat_x = false; bool repeat_y = false; @@ -660,7 +665,7 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale, content_get_width(background->background)) * scale * FIXTOFLT(hpos) / 100.; } else { - x += (int) (FIXTOFLT(nscss_len2px(hpos, hunit, + x += (int) (FIXTOFLT(nscss_len2px(len_ctx, hpos, hunit, background->style)) * scale); } @@ -669,7 +674,7 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale, content_get_height(background->background)) * scale * FIXTOFLT(vpos) / 100.; } else { - y += (int) (FIXTOFLT(nscss_len2px(vpos, vunit, + y += (int) (FIXTOFLT(nscss_len2px(len_ctx, vpos, vunit, background->style)) * scale); } } @@ -802,13 +807,15 @@ static bool html_redraw_background(int x, int y, struct box *box, float scale, * \param first true if this is the first rectangle associated with the inline * \param last true if this is the last rectangle associated with the inline * \param background_colour updated to current background colour if plotted - * \param ctx current redraw context + * \param len_ctx Length conversion context + * \param ctx current redraw context * \return true if successful, false otherwise */ static bool html_redraw_inline_background(int x, int y, struct box *box, float scale, const struct rect *clip, struct rect b, bool first, bool last, colour *background_colour, + const nscss_len_ctx *len_ctx, const struct redraw_context *ctx) { struct rect r = *clip; @@ -869,7 +876,7 @@ static bool html_redraw_inline_background(int x, int y, struct box *box, plot_content = false; } } else { - x += (int) (FIXTOFLT(nscss_len2px(hpos, hunit, + x += (int) (FIXTOFLT(nscss_len2px(len_ctx, hpos, hunit, box->style)) * scale); } @@ -878,7 +885,7 @@ static bool html_redraw_inline_background(int x, int y, struct box *box, content_get_height(box->background) * scale) * FIXTOFLT(vpos) / 100.; } else { - y += (int) (FIXTOFLT(nscss_len2px(vpos, vunit, + y += (int) (FIXTOFLT(nscss_len2px(len_ctx, vpos, vunit, box->style)) * scale); } } @@ -1120,7 +1127,7 @@ static bool html_redraw_text_box(const html_content *html, struct box *box, bool excluded = (box->object != NULL); plot_font_style_t fstyle; - font_plot_style_from_css(box->style, &fstyle); + font_plot_style_from_css(&html->len_ctx, box->style, &fstyle); fstyle.background = current_background_color; if (!text_redraw(box->text, box->length, box->byte_offset, @@ -1382,21 +1389,25 @@ bool html_redraw_box(const html_content *html, struct box *box, /* We have an absolutly positioned box with a clip rect */ if (css_rect.left_auto == false) r.x0 = x - border_left + FIXTOINT(nscss_len2px( + &html->len_ctx, css_rect.left, css_rect.lunit, box->style)); if (css_rect.top_auto == false) r.y0 = y - border_top + FIXTOINT(nscss_len2px( + &html->len_ctx, css_rect.top, css_rect.tunit, box->style)); if (css_rect.right_auto == false) r.x1 = x - border_left + FIXTOINT(nscss_len2px( + &html->len_ctx, css_rect.right, css_rect.runit, box->style)); if (css_rect.bottom_auto == false) r.y1 = y - border_top + FIXTOINT(nscss_len2px( + &html->len_ctx, css_rect.bottom, css_rect.bunit, box->style)); @@ -1486,7 +1497,8 @@ bool html_redraw_box(const html_content *html, struct box *box, if ((p.x0 < p.x1) && (p.y0 < p.y1)) { /* plot background */ if (!html_redraw_background(x, y, box, scale, &p, - &current_background_color, bg_box, ctx)) + &current_background_color, bg_box, + &html->len_ctx, ctx)) return false; /* restore previous graphics window */ if (ctx->plot->clip(ctx, &r) != NSERROR_OK) @@ -1565,7 +1577,8 @@ bool html_redraw_box(const html_content *html, struct box *box, if (!html_redraw_inline_background( x, y, box, scale, &p, b, first, false, - &current_background_color, ctx)) + &current_background_color, + &html->len_ctx, ctx)) return false; /* restore previous graphics window */ if (ctx->plot->clip(ctx, &r) != NSERROR_OK) @@ -1597,7 +1610,8 @@ bool html_redraw_box(const html_content *html, struct box *box, /* plot background and borders for last rectangle of * the inline */ if (!html_redraw_inline_background(x, ib_y, box, scale, &p, b, - first, true, &current_background_color, ctx)) + first, true, &current_background_color, + &html->len_ctx, ctx)) return false; /* restore previous graphics window */ if (ctx->plot->clip(ctx, &r) != NSERROR_OK) @@ -1768,7 +1782,6 @@ bool html_redraw_box(const html_content *html, struct box *box, obj, sizeof(obj) - 1) != NSERROR_OK) return false; } - } else if (box->iframe) { /* Offset is passed to browser window redraw unscaled */ @@ -1789,7 +1802,7 @@ bool html_redraw_box(const html_content *html, struct box *box, } else if (box->gadget && box->gadget->type == GADGET_FILE) { if (!html_redraw_file(x + padding_left, y + padding_top, width, height, box, scale, - current_background_color, ctx)) + current_background_color, &html->len_ctx, ctx)) return false; } else if (box->gadget && diff --git a/render/layout.c b/render/layout.c index 7ca688f..f6b774a 100644 --- a/render/layout.c +++ b/render/layout.c @@ -68,9 +68,64 @@ /* Fixed point percentage (a) of an integer (b), to an integer */ #define FPCT_OF_INT_TOINT(a, b) (FIXTOINT(FDIV((a * b), F_100))) +typedef uint8_t (*css_len_func)( + const css_computed_style *style, + css_fixed *length, css_unit *unit); +typedef uint8_t (*css_border_style_func)( + const css_computed_style *style); +typedef uint8_t (*css_border_color_func)( + const css_computed_style *style, + css_color *color); + +/** Array of per-side access functions for computed style margins. */ +static const css_len_func margin_funcs[4] = { + [TOP] = css_computed_margin_top, + [RIGHT] = css_computed_margin_right, + [BOTTOM] = css_computed_margin_bottom, + [LEFT] = css_computed_margin_left, +}; + +/** Array of per-side access functions for computed style paddings. */ +static const css_len_func padding_funcs[4] = { + [TOP] = css_computed_padding_top, + [RIGHT] = css_computed_padding_right, + [BOTTOM] = css_computed_padding_bottom, + [LEFT] = css_computed_padding_left, +}; + +/** Array of per-side access functions for computed style border_widths. */ +static const css_len_func border_width_funcs[4] = { + [TOP] = css_computed_border_top_width, + [RIGHT] = css_computed_border_right_width, + [BOTTOM] = css_computed_border_bottom_width, + [LEFT] = css_computed_border_left_width, +}; + +/** Array of per-side access functions for computed style border styles. */ +static const css_border_style_func border_style_funcs[4] = { + [TOP] = css_computed_border_top_style, + [RIGHT] = css_computed_border_right_style, + [BOTTOM] = css_computed_border_bottom_style, + [LEFT] = css_computed_border_left_style, +}; + +/** Array of per-side access functions for computed style border colors. */ +static const css_border_color_func border_color_funcs[4] = { + [TOP] = css_computed_border_top_color, + [RIGHT] = css_computed_border_right_color, + [BOTTOM] = css_computed_border_bottom_color, + [LEFT] = css_computed_border_left_color, +}; + /* forward declaration to break cycles */ -static bool layout_block_context(struct box *block, int viewport_height, html_content *content); -static void layout_minmax_block(struct box *block, const struct gui_layout_table *font_func); +static bool layout_block_context( + struct box *block, + int viewport_height, + html_content *content); +static void layout_minmax_block( + struct box *block, + const struct gui_layout_table *font_func, + const html_content *content); /** @@ -179,7 +234,9 @@ layout_get_object_dimensions(struct box *box, * \param width width of containing block * \return length of indent */ -static int layout_text_indent(const css_computed_style *style, int width) +static int layout_text_indent( + const nscss_len_ctx *len_ctx, + const css_computed_style *style, int width) { css_fixed value = 0; css_unit unit = CSS_UNIT_PX; @@ -189,7 +246,7 @@ static int layout_text_indent(const css_computed_style *style, int width) if (unit == CSS_UNIT_PCT) { return FPCT_OF_INT_TOINT(value, width); } else { - return FIXTOINT(nscss_len2px(value, unit, style)); + return FIXTOINT(nscss_len2px(len_ctx, value, unit, style)); } } @@ -197,6 +254,7 @@ static int layout_text_indent(const css_computed_style *style, int width) /** * Determine width of margin, borders, and padding on one side of a box. * + * \param len_ctx CSS length conversion context for document * \param style style to measure * \param side side of box to measure * \param margin whether margin width is required @@ -206,7 +264,8 @@ static int layout_text_indent(const css_computed_style *style, int width) * \param frac increased by sum of fractional margin and padding */ static void -calculate_mbp_width(const css_computed_style *style, +calculate_mbp_width(const nscss_len_ctx *len_ctx, + const css_computed_style *style, unsigned int side, bool margin, bool border, @@ -214,35 +273,6 @@ calculate_mbp_width(const css_computed_style *style, int *fixed, float *frac) { - typedef uint8_t (*len_func)(const css_computed_style *style, - css_fixed *length, css_unit *unit); - - static len_func margin_funcs[4] = { - css_computed_margin_top, - css_computed_margin_right, - css_computed_margin_bottom, - css_computed_margin_left - }; - static len_func padding_funcs[4] = { - css_computed_padding_top, - css_computed_padding_right, - css_computed_padding_bottom, - css_computed_padding_left - }; - static struct { - len_func width; - uint8_t (*style)(const css_computed_style *style); - } border_funcs[4] = { - { css_computed_border_top_width, - css_computed_border_top_style }, - { css_computed_border_right_width, - css_computed_border_right_style }, - { css_computed_border_bottom_width, - css_computed_border_bottom_style }, - { css_computed_border_left_width, - css_computed_border_left_style } - }; - css_fixed value = 0; css_unit unit = CSS_UNIT_PX; @@ -257,19 +287,20 @@ calculate_mbp_width(const css_computed_style *style, if (unit == CSS_UNIT_PCT) { *frac += FIXTOINT(FDIV(value, F_100)); } else { - *fixed += FIXTOINT(nscss_len2px(value, unit, - style)); + *fixed += FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } } /* border */ if (border) { - if (border_funcs[side].style(style) != + if (border_style_funcs[side](style) != CSS_BORDER_STYLE_NONE) { - border_funcs[side].width(style, &value, &unit); + border_width_funcs[side](style, &value, &unit); - *fixed += FIXTOINT(nscss_len2px(value, unit, style)); + *fixed += FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } @@ -279,9 +310,197 @@ calculate_mbp_width(const css_computed_style *style, if (unit == CSS_UNIT_PCT) { *frac += FIXTOINT(FDIV(value, F_100)); } else { - *fixed += FIXTOINT(nscss_len2px(value, unit, style)); + *fixed += FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); + } + } +} + + +/** + * Calculate minimum and maximum width of a table. + * + * \param table box of type TABLE + * \param font_func Font functions + * \param content The HTML content we are laying out. + * \post table->min_width and table->max_width filled in, + * 0 <= table->min_width <= table->max_width + */ +static void layout_minmax_table(struct box *table, + const struct gui_layout_table *font_func, + const html_content *content) +{ + unsigned int i, j; + int border_spacing_h = 0; + int table_min = 0, table_max = 0; + int extra_fixed = 0; + float extra_frac = 0; + struct column *col; + struct box *row_group, *row, *cell; + enum css_width_e wtype; + css_fixed value = 0; + css_unit unit = CSS_UNIT_PX; + + /* check if the widths have already been calculated */ + if (table->max_width != UNKNOWN_MAX_WIDTH) + return; + + if (table_calculate_column_types(&content->len_ctx, table) == false) { + NSLOG(netsurf, WARNING, + "Could not establish table column types."); + return; + } + col = table->col; + + /* start with 0 except for fixed-width columns */ + for (i = 0; i != table->columns; i++) { + if (col[i].type == COLUMN_WIDTH_FIXED) + col[i].min = col[i].max = col[i].width; + else + col[i].min = col[i].max = 0; + } + + /* border-spacing is used in the separated borders model */ + if (css_computed_border_collapse(table->style) == + CSS_BORDER_COLLAPSE_SEPARATE) { + css_fixed h = 0, v = 0; + css_unit hu = CSS_UNIT_PX, vu = CSS_UNIT_PX; + + css_computed_border_spacing(table->style, &h, &hu, &v, &vu); + + border_spacing_h = FIXTOINT(nscss_len2px(&content->len_ctx, + h, hu, table->style)); + } + + /* 1st pass: consider cells with colspan 1 only */ + for (row_group = table->children; row_group; row_group =row_group->next) + for (row = row_group->children; row; row = row->next) + for (cell = row->children; cell; cell = cell->next) { + assert(cell->type == BOX_TABLE_CELL); + assert(cell->style); + /** TODO: Handle colspan="0" correctly. + * It's currently converted to 1 in box normaisation */ + assert(cell->columns != 0); + + if (cell->columns != 1) + continue; + + layout_minmax_block(cell, font_func, content); + i = cell->start_column; + + if (col[i].positioned) + continue; + + /* update column min, max widths using cell widths */ + if (col[i].min < cell->min_width) + col[i].min = cell->min_width; + if (col[i].max < cell->max_width) + col[i].max = cell->max_width; + } + + /* 2nd pass: cells which span multiple columns */ + for (row_group = table->children; row_group; row_group =row_group->next) + for (row = row_group->children; row; row = row->next) + for (cell = row->children; cell; cell = cell->next) { + unsigned int flexible_columns = 0; + int min = 0, max = 0, fixed_width = 0, extra; + + if (cell->columns == 1) + continue; + + layout_minmax_block(cell, font_func, content); + i = cell->start_column; + + /* find min width so far of spanned columns, and count + * number of non-fixed spanned columns and total fixed width */ + for (j = 0; j != cell->columns; j++) { + min += col[i + j].min; + if (col[i + j].type == COLUMN_WIDTH_FIXED) + fixed_width += col[i + j].width; + else + flexible_columns++; + } + min += (cell->columns - 1) * border_spacing_h; + + /* distribute extra min to spanned columns */ + if (min < cell->min_width) { + if (flexible_columns == 0) { + extra = 1 + (cell->min_width - min) / + cell->columns; + for (j = 0; j != cell->columns; j++) { + col[i + j].min += extra; + if (col[i + j].max < col[i + j].min) + col[i + j].max = col[i + j].min; + } + } else { + extra = 1 + (cell->min_width - min) / + flexible_columns; + for (j = 0; j != cell->columns; j++) { + if (col[i + j].type != + COLUMN_WIDTH_FIXED) { + col[i + j].min += extra; + if (col[i + j].max < + col[i + j].min) + col[i + j].max = + col[i + j].min; + } + } + } + } + + /* find max width so far of spanned columns */ + for (j = 0; j != cell->columns; j++) + max += col[i + j].max; + max += (cell->columns - 1) * border_spacing_h; + + /* distribute extra max to spanned columns */ + if (max < cell->max_width && flexible_columns) { + extra = 1 + (cell->max_width - max) / flexible_columns; + for (j = 0; j != cell->columns; j++) + if (col[i + j].type != COLUMN_WIDTH_FIXED) + col[i + j].max += extra; + } + } + + for (i = 0; i != table->columns; i++) { + if (col[i].max < col[i].min) { + box_dump(stderr, table, 0, true); + assert(0); } + table_min += col[i].min; + table_max += col[i].max; + } + + /* fixed width takes priority, unless it is too narrow */ + wtype = css_computed_width(table->style, &value, &unit); + if (wtype == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) { + int width = FIXTOINT(nscss_len2px(&content->len_ctx, + value, unit, table->style)); + if (table_min < width) + table_min = width; + if (table_max < width) + table_max = width; } + + /* add margins, border, padding to min, max widths */ + calculate_mbp_width(&content->len_ctx, + table->style, LEFT, true, true, true, + &extra_fixed, &extra_frac); + calculate_mbp_width(&content->len_ctx, + table->style, RIGHT, true, true, true, + &extra_fixed, &extra_frac); + if (extra_fixed < 0) + extra_fixed = 0; + if (extra_frac < 0) + extra_frac = 0; + if (1.0 <= extra_frac) + extra_frac = 0.9; + table->min_width = (table_min + extra_fixed) / (1.0 - extra_frac); + table->max_width = (table_max + extra_fixed) / (1.0 - extra_frac); + table->min_width += (table->columns + 1) * border_spacing_h; + table->max_width += (table->columns + 1) * border_spacing_h; + + assert(0 <= table->min_width && table->min_width <= table->max_width); } @@ -303,7 +522,8 @@ layout_minmax_line(struct box *first, int *line_max, bool first_line, bool *line_has_height, - const struct gui_layout_table *font_func) + const struct gui_layout_table *font_func, + const html_content *content) { int min = 0, max = 0, width, height, fixed; float frac; @@ -349,9 +569,11 @@ layout_minmax_line(struct box *first, if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) { assert(b->children); if (b->children->type == BOX_BLOCK) - layout_minmax_block(b->children, font_func); + layout_minmax_block(b->children, font_func, + content); else - layout_minmax_table(b->children, font_func); + layout_minmax_table(b->children, font_func, + content); b->min_width = b->children->min_width; b->max_width = b->children->max_width; if (min < b->min_width) @@ -361,7 +583,7 @@ layout_minmax_line(struct box *first, } if (b->type == BOX_INLINE_BLOCK) { - layout_minmax_block(b, font_func); + layout_minmax_block(b, font_func, content); if (min < b->min_width) min = b->min_width; max += b->max_width; @@ -372,16 +594,18 @@ layout_minmax_line(struct box *first, } assert(b->style); - font_plot_style_from_css(b->style, &fstyle); + font_plot_style_from_css(&content->len_ctx, b->style, &fstyle); if (b->type == BOX_INLINE && !b->object && !(b->flags & REPLACE_DIM) && !(b->flags & IFRAME)) { fixed = frac = 0; - calculate_mbp_width(b->style, LEFT, true, true, true, + calculate_mbp_width(&content->len_ctx, + b->style, LEFT, true, true, true, &fixed, &frac); if (!b->inline_end) - calculate_mbp_width(b->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->style, RIGHT, true, true, true, &fixed, &frac); if (0 < fixed) @@ -390,7 +614,8 @@ layout_minmax_line(struct box *first, /* \todo update min width, consider fractional extra */ } else if (b->type == BOX_INLINE_END) { fixed = frac = 0; - calculate_mbp_width(b->inline_end->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->inline_end->style, RIGHT, true, true, true, &fixed, &frac); if (0 < fixed) @@ -511,15 +736,17 @@ layout_minmax_line(struct box *first, width = AUTO; } else { - width = FIXTOINT(nscss_len2px(value, unit, - b->style)); + width = FIXTOINT(nscss_len2px(&content->len_ctx, + value, unit, b->style)); if (bs == CSS_BOX_SIZING_BORDER_BOX) { fixed = frac = 0; - calculate_mbp_width(block->style, LEFT, + calculate_mbp_width(&content->len_ctx, + block->style, LEFT, false, true, true, &fixed, &frac); - calculate_mbp_width(block->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + block->style, RIGHT, false, true, true, &fixed, &frac); if (width < fixed) { @@ -536,7 +763,8 @@ layout_minmax_line(struct box *first, /* height */ htype = css_computed_height(b->style, &value, &unit); if (htype == CSS_HEIGHT_SET) { - height = FIXTOINT(nscss_len2px(value, unit, b->style)); + height = FIXTOINT(nscss_len2px(&content->len_ctx, + value, unit, b->style)); } else { height = AUTO; } @@ -552,17 +780,21 @@ layout_minmax_line(struct box *first, fixed = frac = 0; if (bs == CSS_BOX_SIZING_BORDER_BOX) { - calculate_mbp_width(b->style, LEFT, + calculate_mbp_width(&content->len_ctx, + b->style, LEFT, true, false, false, &fixed, &frac); - calculate_mbp_width(b->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->style, RIGHT, true, false, false, &fixed, &frac); } else { - calculate_mbp_width(b->style, LEFT, + calculate_mbp_width(&content->len_ctx, + b->style, LEFT, true, true, true, &fixed, &frac); - calculate_mbp_width(b->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->style, RIGHT, true, true, true, &fixed, &frac); } @@ -575,17 +807,21 @@ layout_minmax_line(struct box *first, fixed = frac = 0; if (bs == CSS_BOX_SIZING_BORDER_BOX) { - calculate_mbp_width(b->style, LEFT, + calculate_mbp_width(&content->len_ctx, + b->style, LEFT, true, false, false, &fixed, &frac); - calculate_mbp_width(b->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->style, RIGHT, true, false, false, &fixed, &frac); } else { - calculate_mbp_width(b->style, LEFT, + calculate_mbp_width(&content->len_ctx, + b->style, LEFT, true, true, true, &fixed, &frac); - calculate_mbp_width(b->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + b->style, RIGHT, true, true, true, &fixed, &frac); } @@ -596,8 +832,10 @@ layout_minmax_line(struct box *first, } else { /* form control with no object */ if (width == AUTO) - width = FIXTOINT(nscss_len2px(INTTOFIX(1), - CSS_UNIT_EM, b->style)); + width = FIXTOINT(nscss_len2px( + &content->len_ctx, + INTTOFIX(1), CSS_UNIT_EM, + b->style)); } if (min < width) @@ -610,7 +848,7 @@ layout_minmax_line(struct box *first, if (first_line) { /* todo: handle percentage values properly */ /* todo: handle text-indent interaction with floats */ - int text_indent = layout_text_indent( + int text_indent = layout_text_indent(&content->len_ctx, first->parent->parent->style, 100); min = (min + text_indent < 0) ? 0 : min + text_indent; max = (max + text_indent < 0) ? 0 : max + text_indent; @@ -640,7 +878,8 @@ layout_minmax_line(struct box *first, static void layout_minmax_inline_container(struct box *inline_container, bool *has_height, - const struct gui_layout_table *font_func) + const struct gui_layout_table *font_func, + const html_content *content) { struct box *child; int line_min = 0, line_max = 0; @@ -658,7 +897,8 @@ layout_minmax_inline_container(struct box *inline_container, for (child = inline_container->children; child; ) { child = layout_minmax_line(child, &line_min, &line_max, - first_line, &line_has_height, font_func); + first_line, &line_has_height, font_func, + content); if (min < line_min) min = line_min; if (max < line_max) @@ -681,11 +921,14 @@ layout_minmax_inline_container(struct box *inline_container, * * \param block box of type BLOCK, INLINE_BLOCK, or TABLE_CELL * \param font_func font functions + * \param content The HTML content being layed out. * \post block->min_width and block->max_width filled in, * 0 <= block->min_width <= block->max_width */ -static void -layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) +static void layout_minmax_block( + struct box *block, + const struct gui_layout_table *font_func, + const html_content *content) { struct box *child; int min = 0, max = 0; @@ -738,7 +981,8 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) css_fixed size = INTTOFIX(10); css_unit unit = CSS_UNIT_EM; - min = max = FIXTOINT(nscss_len2px(size, unit, block->style)); + min = max = FIXTOINT(nscss_len2px(&content->len_ctx, + size, unit, block->style)); block->flags |= HAS_HEIGHT; } @@ -751,7 +995,8 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) /* form checkbox or radio button * if width is AUTO, set it to 1em */ - min = max = FIXTOINT(nscss_len2px(size, unit, block->style)); + min = max = FIXTOINT(nscss_len2px(&content->len_ctx, + size, unit, block->style)); block->flags |= HAS_HEIGHT; } @@ -759,7 +1004,7 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) if (block->object) { if (content_get_type(block->object) == CONTENT_HTML) { layout_minmax_block(html_get_box_tree(block->object), - font_func); + font_func, content); min = html_get_box_tree(block->object)->min_width; max = html_get_box_tree(block->object)->max_width; } else { @@ -776,7 +1021,8 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) for (child = block->children; child; child = child->next) { switch (child->type) { case BOX_BLOCK: - layout_minmax_block(child, font_func); + layout_minmax_block(child, font_func, + content); if (child->flags & HAS_HEIGHT) child_has_height = true; break; @@ -785,7 +1031,8 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) child->flags |= NEED_MIN; layout_minmax_inline_container(child, - &child_has_height, font_func); + &child_has_height, font_func, + content); if (child_has_height && child == child->parent->children) { @@ -793,7 +1040,8 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) } break; case BOX_TABLE: - layout_minmax_table(child, font_func); + layout_minmax_table(child, font_func, + content); /* todo: fix for zero height tables */ child_has_height = true; child->flags |= MAKE_HEIGHT; @@ -831,14 +1079,17 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) /* fixed width takes priority */ if (block->type != BOX_TABLE_CELL && wtype == CSS_WIDTH_SET && wunit != CSS_UNIT_PCT) { - min = max = FIXTOINT(nscss_len2px(width, wunit, block->style)); + min = max = FIXTOINT(nscss_len2px(&content->len_ctx, + width, wunit, block->style)); if (bs == CSS_BOX_SIZING_BORDER_BOX) { int border_box_fixed = 0; float border_box_frac = 0; - calculate_mbp_width(block->style, LEFT, + calculate_mbp_width(&content->len_ctx, + block->style, LEFT, false, true, true, &border_box_fixed, &border_box_frac); - calculate_mbp_width(block->style, RIGHT, + calculate_mbp_width(&content->len_ctx, + block->style, RIGHT, false, true, true, &border_box_fixed, &border_box_frac); if (min < border_box_fixed) { @@ -858,14 +1109,18 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) * and paddings are wrong. */ if (bs == CSS_BOX_SIZING_BORDER_BOX && wtype == CSS_WIDTH_SET) { /* Border and padding included in width, so just get margin */ - calculate_mbp_width(block->style, LEFT, true, false, false, + calculate_mbp_width(&content->len_ctx, + block->style, LEFT, true, false, false, &extra_fixed, &extra_frac); - calculate_mbp_width(block->style, RIGHT, true, false, false, + calculate_mbp_width(&content->len_ctx, + block->style, RIGHT, true, false, false, &extra_fixed, &extra_frac); } else { - calculate_mbp_width(block->style, LEFT, true, true, true, + calculate_mbp_width(&content->len_ctx, + block->style, LEFT, true, true, true, &extra_fixed, &extra_frac); - calculate_mbp_width(block->style, RIGHT, true, true, true, + calculate_mbp_width(&content->len_ctx, + block->style, RIGHT, true, true, true, &extra_fixed, &extra_frac); } if (extra_fixed < 0) @@ -895,6 +1150,7 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) * * This turns the specified dimension into a content-box dimension. * + * \param len_ctx Length conversion context * \param box gadget to adjust dimensions of * \param available_width width of containing block * \param setwidth set true if the dimension to be tweaked is a width, @@ -904,6 +1160,7 @@ layout_minmax_block(struct box *block, const struct gui_layout_table *font_func) * gadget properties. */ static void layout_handle_box_sizing( + const nscss_len_ctx *len_ctx, struct box *box, int available_width, bool setwidth, @@ -920,9 +1177,11 @@ static void layout_handle_box_sizing( int fixed = 0; float frac = 0; - calculate_mbp_width(box->style, setwidth ? LEFT : TOP, + calculate_mbp_width(len_ctx, box->style, + setwidth ? LEFT : TOP, false, true, true, &fixed, &frac); - calculate_mbp_width(box->style, setwidth ? RIGHT : BOTTOM, + calculate_mbp_width(len_ctx, box->style, + setwidth ? RIGHT : BOTTOM, false, true, true, &fixed, &frac); orig -= frac * available_width + fixed; *dimension = orig > 0 ? orig : 0; @@ -933,6 +1192,7 @@ static void layout_handle_box_sizing( /** * Calculate width, height, and thickness of margins, paddings, and borders. * + * \param len_ctx Length conversion context * \param available_width width of containing block * \param viewport_height height of viewport in pixels or -ve if unknown * \param box current box @@ -949,7 +1209,8 @@ static void layout_handle_box_sizing( * \param border filled with border widths, may be NULL */ static void -layout_find_dimensions(int available_width, +layout_find_dimensions(const nscss_len_ctx *len_ctx, + int available_width, int viewport_height, struct box *box, const css_computed_style *style, @@ -978,15 +1239,15 @@ layout_find_dimensions(int available_width, *width = FPCT_OF_INT_TOINT( value, available_width); } else { - *width = FIXTOINT(nscss_len2px(value, unit, - style)); + *width = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { *width = AUTO; } if (*width != AUTO) { - layout_handle_box_sizing(box, available_width, + layout_handle_box_sizing(len_ctx, box, available_width, true, width); } } @@ -1066,15 +1327,15 @@ layout_find_dimensions(int available_width, *height = AUTO; } } else { - *height = FIXTOINT(nscss_len2px(value, unit, - style)); + *height = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { *height = AUTO; } if (*height != AUTO) { - layout_handle_box_sizing(box, available_width, + layout_handle_box_sizing(len_ctx, box, available_width, false, height); } } @@ -1091,8 +1352,8 @@ layout_find_dimensions(int available_width, *max_width = FPCT_OF_INT_TOINT(value, available_width); } else { - *max_width = FIXTOINT(nscss_len2px(value, unit, - style)); + *max_width = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { /* Inadmissible */ @@ -1100,7 +1361,7 @@ layout_find_dimensions(int available_width, } if (*max_width != -1) { - layout_handle_box_sizing(box, available_width, + layout_handle_box_sizing(len_ctx, box, available_width, true, max_width); } } @@ -1117,8 +1378,8 @@ layout_find_dimensions(int available_width, *min_width = FPCT_OF_INT_TOINT(value, available_width); } else { - *min_width = FIXTOINT(nscss_len2px(value, unit, - style)); + *min_width = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { /* Inadmissible */ @@ -1126,7 +1387,7 @@ layout_find_dimensions(int available_width, } if (*min_width != 0) { - layout_handle_box_sizing(box, available_width, + layout_handle_box_sizing(len_ctx, box, available_width, true, min_width); } } @@ -1143,8 +1404,8 @@ layout_find_dimensions(int available_width, /* TODO: handle percentage */ *max_height = -1; } else { - *max_height = FIXTOINT(nscss_len2px(value, unit, - style)); + *max_height = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { /* Inadmissible */ @@ -1164,8 +1425,8 @@ layout_find_dimensions(int available_width, /* TODO: handle percentage */ *min_height = 0; } else { - *min_height = FIXTOINT(nscss_len2px(value, unit, - style)); + *min_height = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } else { /* Inadmissible */ @@ -1179,32 +1440,16 @@ layout_find_dimensions(int available_width, css_fixed value = 0; css_unit unit = CSS_UNIT_PX; - switch (i) { - case TOP: - type = css_computed_margin_top(style, - &value, &unit); - break; - case RIGHT: - type = css_computed_margin_right(style, - &value, &unit); - break; - case BOTTOM: - type = css_computed_margin_bottom(style, - &value, &unit); - break; - case LEFT: - type = css_computed_margin_left(style, - &value, &unit); - break; - } + type = margin_funcs[i](style, &value, &unit); if (type == CSS_MARGIN_SET) { if (unit == CSS_UNIT_PCT) { margin[i] = FPCT_OF_INT_TOINT(value, available_width); } else { - margin[i] = FIXTOINT(nscss_len2px(value, - unit, style)); + margin[i] = FIXTOINT(nscss_len2px( + len_ctx, + value, unit, style)); } } else { margin[i] = AUTO; @@ -1215,29 +1460,14 @@ layout_find_dimensions(int available_width, css_fixed value = 0; css_unit unit = CSS_UNIT_PX; - switch (i) { - case TOP: - css_computed_padding_top(style, &value, &unit); - break; - case RIGHT: - css_computed_padding_right(style, &value, - &unit); - break; - case BOTTOM: - css_computed_padding_bottom(style, &value, - &unit); - break; - case LEFT: - css_computed_padding_left(style, &value, &unit); - break; - } + padding_funcs[i](style, &value, &unit); if (unit == CSS_UNIT_PCT) { padding[i] = FPCT_OF_INT_TOINT(value, available_width); } else { - padding[i] = FIXTOINT(nscss_len2px(value, unit, - style)); + padding[i] = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); } } @@ -1248,33 +1478,9 @@ layout_find_dimensions(int available_width, css_fixed value = 0; css_unit unit = CSS_UNIT_PX; - switch (i) { - case TOP: - css_computed_border_top_width(style, &value, - &unit); - bstyle = css_computed_border_top_style(style); - css_computed_border_top_color(style, &color); - break; - case RIGHT: - css_computed_border_right_width(style, &value, - &unit); - bstyle = css_computed_border_right_style(style); - css_computed_border_right_color(style, &color); - break; - case BOTTOM: - css_computed_border_bottom_width(style, &value, - &unit); - bstyle = css_computed_border_bottom_style( - style); - css_computed_border_bottom_color(style, &color); - break; - case LEFT: - css_computed_border_left_width(style, &value, - &unit); - bstyle = css_computed_border_left_style(style); - css_computed_border_left_color(style, &color); - break; - } + border_width_funcs[i](style, &value, &unit); + bstyle = border_style_funcs[i](style); + border_color_funcs[i](style, &color); border[i].style = bstyle; border[i].c = color; @@ -1284,8 +1490,8 @@ layout_find_dimensions(int available_width, /* spec unclear: following Mozilla */ border[i].width = 0; else - border[i].width = FIXTOINT(nscss_len2px(value, - unit, style)); + border[i].width = FIXTOINT(nscss_len2px(len_ctx, + value, unit, style)); /* Special case for border-collapse: make all borders * on table/table-row-group/table-row zero width. */ @@ -1303,6 +1509,7 @@ layout_find_dimensions(int available_width, /** * Find next block that current margin collapses to. * + * \param len_ctx Length conversion context * \param box box to start tree-order search from (top margin is included) * \param block box responsible for current block fromatting context * \param viewport_height height of viewport in px @@ -1311,7 +1518,8 @@ layout_find_dimensions(int available_width, * \return next box that current margin collapses to, or NULL if none. */ static struct box* -layout_next_margin_block(struct box *box, +layout_next_margin_block(const nscss_len_ctx *len_ctx, + struct box *box, struct box *block, int viewport_height, int *max_pos_margin, @@ -1330,7 +1538,8 @@ layout_next_margin_block(struct box *box, /* Get margins */ if (box->style) { - layout_find_dimensions(box->parent->width, + layout_find_dimensions(len_ctx, + box->parent->width, viewport_height, box, box->style, NULL, NULL, NULL, NULL, @@ -1404,7 +1613,8 @@ layout_next_margin_block(struct box *box, /* Get margins */ if (box->style) { - layout_find_dimensions(box->parent->width, + layout_find_dimensions(len_ctx, + box->parent->width, viewport_height, box, box->style, NULL, NULL, NULL, NULL, @@ -1640,6 +1850,7 @@ layout_solve_width(struct box *box, * Compute dimensions of box, margins, paddings, and borders for a block-level * element. * + * \param len_ctx Length conversion context * \param available_width Max width available in pixels * \param viewport_height Height of viewport in pixels or -ve if unknown * \param lm min left margin required to avoid floats in px. @@ -1652,7 +1863,8 @@ layout_solve_width(struct box *box, * See CSS 2.1 10.3.3, 10.3.4, 10.6.2, and 10.6.3. */ static void -layout_block_find_dimensions(int available_width, +layout_block_find_dimensions(const nscss_len_ctx *len_ctx, + int available_width, int viewport_height, int lm, int rm, @@ -1665,8 +1877,8 @@ layout_block_find_dimensions(int available_width, struct box_border *border = box->border; const css_computed_style *style = box->style; - layout_find_dimensions(available_width, viewport_height, box, style, - &width, &height, &max_width, &min_width, + layout_find_dimensions(len_ctx, available_width, viewport_height, box, + style, &width, &height, &max_width, &min_width, &max_height, &min_height, margin, padding, border); if (box->object && !(box->flags & REPLACE_DIM) && @@ -1819,8 +2031,9 @@ static bool layout_table(struct box *table, int available_width, memcpy(col, table->col, sizeof(col[0]) * columns); /* find margins, paddings, and borders for table and cells */ - layout_find_dimensions(available_width, -1, table, style, 0, 0, 0, 0, - 0, 0, table->margin, table->padding, table->border); + layout_find_dimensions(&content->len_ctx, available_width, -1, table, + style, 0, 0, 0, 0, 0, 0, table->margin, table->padding, + table->border); for (row_group = table->children; row_group; row_group = row_group->next) { for (row = row_group->children; row; row = row->next) { @@ -1829,9 +2042,11 @@ static bool layout_table(struct box *table, int available_width, enum css_overflow_e overflow_y; assert(c->style); - table_used_border_for_cell(c); - layout_find_dimensions(available_width, -1, - c, c->style, 0, 0, 0, 0, 0, 0, + table_used_border_for_cell( + &content->len_ctx, c); + layout_find_dimensions(&content->len_ctx, + available_width, -1, c, + c->style, 0, 0, 0, 0, 0, 0, 0, c->padding, c->border); overflow_x = css_computed_overflow_x(c->style); @@ -1859,8 +2074,10 @@ static bool layout_table(struct box *table, int available_width, css_computed_border_spacing(style, &h, &hu, &v, &vu); - border_spacing_h = FIXTOINT(nscss_len2px(h, hu, style)); - border_spacing_v = FIXTOINT(nscss_len2px(v, vu, style)); + border_spacing_h = FIXTOINT(nscss_len2px(&content->len_ctx, + h, hu, style)); + border_spacing_v = FIXTOINT(nscss_len2px(&content->len_ctx, + v, vu, style)); } /* find specified table width, or available width if auto-width */ @@ -1870,7 +2087,8 @@ static bool layout_table(struct box *table, int available_width, table_width = FPCT_OF_INT_TOINT(value, available_width); } else { table_width = - FIXTOINT(nscss_len2px(value, unit, style)); + FIXTOINT(nscss_len2px(&content->len_ctx, + value, unit, style)); } /* specified width includes border */ @@ -1948,7 +2166,8 @@ static bool layout_table(struct box *table, int available_width, } else { /* This is the minimum height for the table * (see 17.5.3) */ - min_height = FIXTOINT(nscss_len2px(value, unit, style)); + min_height = FIXTOINT(nscss_len2px(&content->len_ctx, + value, unit, style)); } } @@ -2138,8 +2357,9 @@ static bool layout_table(struct box *table, int available_width, htype = css_computed_height(row->style, &value, &unit); if (htype == CSS_HEIGHT_SET && unit != CSS_UNIT_PCT) { - row_height = FIXTOINT(nscss_len2px(value, unit, - row->style)); + row_height = FIXTOINT(nscss_len2px( + &content->len_ctx, + value, unit, row->style)); } for (c = row->children; c; c = c->next) { assert(c->style); @@ -2176,8 +2396,9 @@ static bool layout_table(struct box *table, int available_width, /* some sites use height="1" or similar * to attempt to make cells as small as * possible, so treat it as a minimum */ - int h = FIXTOINT(nscss_len2px(value, - unit, c->style)); + int h = FIXTOINT(nscss_len2px( + &content->len_ctx, + value, unit, c->style)); if (c->height < h) c->height = h; } @@ -2321,12 +2542,16 @@ static bool layout_table(struct box *table, int available_width, /** * Manimpulate box height according to CSS min-height and max-height properties * + * \param len_ctx CSS length conversion context for document. * \param box block to modify with any min-height or max-height * \param container containing block for absolutely positioned elements, or * NULL for non absolutely positioned elements. * \return whether the height has been changed */ -static bool layout_apply_minmax_height(struct box *box, struct box *container) +static bool layout_apply_minmax_height( + const nscss_len_ctx *len_ctx, + struct box *box, + struct box *container) { int h; struct box *containing_block = NULL; @@ -2385,8 +2610,8 @@ static bool layout_apply_minmax_height(struct box *box, struct box *container) } } } else { - h = FIXTOINT(nscss_len2px(value, unit, - box->style)); + h = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); if (h < box->height) { box->height = h; updated = true; @@ -2415,8 +2640,8 @@ static bool layout_apply_minmax_height(struct box *box, struct box *container) } } } else { - h = FIXTOINT(nscss_len2px(value, unit, - box->style)); + h = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); if (h > box->height) { box->height = h; updated = true; @@ -2459,2643 +2684,2482 @@ static bool layout_block_object(struct box *block) /** - * Layout a block formatting context. + * Insert a float into a container. * - * \param block BLOCK, INLINE_BLOCK, or TABLE_CELL to layout - * \param viewport_height Height of viewport in pixels or -ve if unknown - * \param content Memory pool for any new boxes - * \return true on success, false on memory exhaustion + * \param cont block formatting context block, used to contain float + * \param b box to add to float * - * This function carries out layout of a block and its children, as described - * in CSS 2.1 9.4.1. + * This sorts floats in order of descending bottom edges. */ -static bool -layout_block_context(struct box *block, - int viewport_height, - html_content *content) +static void add_float_to_container(struct box *cont, struct box *b) { - struct box *box; - int cx, cy; /**< current coordinates */ - int max_pos_margin = 0; - int max_neg_margin = 0; - int y = 0; - int lm, rm; - struct box *margin_collapse = NULL; - bool in_margin = false; - css_fixed gadget_size; - css_unit gadget_unit; /* Checkbox / radio buttons */ + struct box *box = cont->float_children; + int b_bottom = b->y + b->height; - assert(block->type == BOX_BLOCK || - block->type == BOX_INLINE_BLOCK || - block->type == BOX_TABLE_CELL); - assert(block->width != UNKNOWN_WIDTH); - assert(block->width != AUTO); + assert(b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT); - block->float_children = NULL; - block->cached_place_below_level = 0; - block->clear_level = 0; + if (box == NULL) { + /* No other float children */ + b->next_float = NULL; + cont->float_children = b; + return; + } else if (b_bottom >= box->y + box->height) { + /* Goes at start of list */ + b->next_float = cont->float_children; + cont->float_children = b; + } else { + struct box *prev = NULL; + while (box != NULL && b_bottom < box->y + box->height) { + prev = box; + box = box->next_float; + } + if (prev != NULL) { + b->next_float = prev->next_float; + prev->next_float = b; + } + } +} - /* special case if the block contains an object */ - if (block->object) { - int temp_width = block->width; - if (!layout_block_object(block)) - return false; - layout_get_object_dimensions(block, &temp_width, - &block->height, INT_MIN, INT_MAX, - INT_MIN, INT_MAX); - return true; - } else if (block->flags & REPLACE_DIM) { - return true; - } - /* special case if the block contains an radio button or checkbox */ - if (block->gadget && (block->gadget->type == GADGET_RADIO || - block->gadget->type == GADGET_CHECKBOX)) { - /* form checkbox or radio button - * if width or height is AUTO, set it to 1em */ - gadget_unit = CSS_UNIT_EM; - gadget_size = INTTOFIX(1); - if (block->height == AUTO) - block->height = FIXTOINT(nscss_len2px(gadget_size, - gadget_unit, block->style)); +/** + * Split a text box. + * + * \param content memory pool for any new boxes + * \param fstyle style for text in text box + * \param split_box box with text to split + * \param new_length new length for text in split_box, after splitting + * \param new_width new width for text in split_box, after splitting + * \return true on success, false on memory exhaustion + * + * A new box is created and inserted into the box tree after split_box, + * containing the text after new_length excluding the initial space character. + */ +static bool +layout_text_box_split(html_content *content, + plot_font_style_t *fstyle, + struct box *split_box, + size_t new_length, + int new_width) +{ + int space_width = split_box->space; + struct box *c2; + const struct gui_layout_table *font_func = content->font_func; + bool space = (split_box->text[new_length] == ' '); + int used_length = new_length + (space ? 1 : 0); + + if ((space && space_width == 0) || space_width == UNKNOWN_WIDTH) { + /* We're need to add a space, and we don't know how big + * it's to be, OR we have a space of unknown width anyway; + * Calculate space width */ + font_func->width(fstyle, " ", 1, &space_width); } - box = block->children; - /* set current coordinates to top-left of the block */ - cx = 0; - y = cy = block->padding[TOP]; - if (box) - box->y = block->padding[TOP]; + if (split_box->space == UNKNOWN_WIDTH) + split_box->space = space_width; + if (!space) + space_width = 0; - /* Step through the descendants of the block in depth-first order, but - * not into the children of boxes which aren't blocks. For example, if - * the tree passed to this function looks like this (box->type shown): - * - * block -> BOX_BLOCK - * BOX_BLOCK * (1) - * BOX_INLINE_CONTAINER * (2) - * BOX_INLINE - * BOX_TEXT - * ... - * BOX_BLOCK * (3) - * BOX_TABLE * (4) - * BOX_TABLE_ROW - * BOX_TABLE_CELL - * ... - * BOX_TABLE_CELL - * ... - * BOX_BLOCK * (5) - * BOX_INLINE_CONTAINER * (6) - * BOX_TEXT - * ... - * then the while loop will visit each box marked with *, setting box - * to each in the order shown. */ - while (box) { - enum css_overflow_e overflow_x = CSS_OVERFLOW_VISIBLE; - enum css_overflow_e overflow_y = CSS_OVERFLOW_VISIBLE; + /* Create clone of split_box, c2 */ + c2 = talloc_memdup(content->bctx, split_box, sizeof *c2); + if (!c2) + return false; + c2->flags |= CLONE; - assert(box->type == BOX_BLOCK || box->type == BOX_TABLE || - box->type == BOX_INLINE_CONTAINER); + /* Set remaining text in c2 */ + c2->text += used_length; - /* Tables are laid out before being positioned, because the - * position depends on the width which is calculated in - * table layout. Blocks and inline containers are positioned - * before being laid out, because width is not dependent on - * content, and the position is required during layout for - * correct handling of floats. - */ + /* Set c2 according to the remaining text */ + c2->width -= new_width + space_width; + c2->flags &= ~MEASURED; /* width has been estimated */ + c2->length = split_box->length - used_length; - if (box->style && - (css_computed_position(box->style) == - CSS_POSITION_ABSOLUTE || - css_computed_position(box->style) == - CSS_POSITION_FIXED)) { - box->x = box->parent->padding[LEFT]; - /* absolute positioned; this element will establish - * its own block context when it gets laid out later, - * so no need to look at its children now. */ - goto advance_to_next_box; - } + /* Update split_box for its reduced text */ + split_box->width = new_width; + split_box->flags |= MEASURED; + split_box->length = new_length; + split_box->space = space_width; - /* If we don't know which box the current margin collapses - * through to, find out. Update the pos/neg margin values. */ - if (margin_collapse == NULL) { - margin_collapse = layout_next_margin_block(box, block, - viewport_height, - &max_pos_margin, &max_neg_margin); - /* We have a margin that has not yet been applied. */ - in_margin = true; - } + /* Insert c2 into box list */ + c2->next = split_box->next; + split_box->next = c2; + c2->prev = split_box; + if (c2->next) + c2->next->prev = c2; + else + c2->parent->last = c2; - /* Clearance. */ - y = 0; - if (box->style && css_computed_clear(box->style) != - CSS_CLEAR_NONE) - y = layout_clear(block->float_children, - css_computed_clear(box->style)); + NSLOG(layout, DEBUG, + "split_box %p len: %" PRIsizet " \"%.*s\"", + split_box, + split_box->length, + (int)split_box->length, + split_box->text); + NSLOG(layout, DEBUG, + " new_box %p len: %" PRIsizet " \"%.*s\"", + c2, + c2->length, + (int)c2->length, + c2->text); - /* Find box's overflow properties */ - if (box->style) { - overflow_x = css_computed_overflow_x(box->style); - overflow_y = css_computed_overflow_y(box->style); - } + return true; +} - /* Blocks establishing a block formatting context get minimum - * left and right margins to avoid any floats. */ - lm = rm = 0; - if (box->type == BOX_BLOCK || box->flags & IFRAME) { - if (!box->object && !(box->flags & IFRAME) && - !(box->flags & REPLACE_DIM) && - box->style && - (overflow_x != CSS_OVERFLOW_VISIBLE || - overflow_y != CSS_OVERFLOW_VISIBLE)) { - /* box establishes new block formatting context - * so available width may be diminished due to - * floats. */ - int x0, x1, top; - struct box *left, *right; - top = cy + max_pos_margin - max_neg_margin; - top = (top > y) ? top : y; - x0 = cx; - x1 = cx + box->parent->width - - box->parent->padding[LEFT] - - box->parent->padding[RIGHT]; - find_sides(block->float_children, top, top, - &x0, &x1, &left, &right); - /* calculate min required left & right margins - * needed to avoid floats */ - lm = x0 - cx; - rm = cx + box->parent->width - - box->parent->padding[LEFT] - - box->parent->padding[RIGHT] - - x1; - } - layout_block_find_dimensions(box->parent->width, - viewport_height, lm, rm, box); - if (box->type == BOX_BLOCK && !(box->flags & IFRAME)) { - layout_block_add_scrollbar(box, RIGHT); - layout_block_add_scrollbar(box, BOTTOM); - } - } else if (box->type == BOX_TABLE) { - if (box->style != NULL) { - enum css_width_e wtype; - css_fixed width = 0; - css_unit unit = CSS_UNIT_PX; +/** + * Compute dimensions of box, margins, paddings, and borders for a floating + * element using shrink-to-fit. Also used for inline-blocks. + * + * \param len_ctx CSS length conversion context for document. + * \param available_width Max width available in pixels + * \param style Box's style + * \param box Box for which to find dimensions + * Box margins, borders, paddings, width and + * height are updated. + */ +static void +layout_float_find_dimensions( + const nscss_len_ctx *len_ctx, + int available_width, + const css_computed_style *style, + struct box *box) +{ + int width, height, max_width, min_width, max_height, min_height; + int *margin = box->margin; + int *padding = box->padding; + struct box_border *border = box->border; + enum css_overflow_e overflow_x = css_computed_overflow_x(style); + enum css_overflow_e overflow_y = css_computed_overflow_y(style); + int scrollbar_width_x = + (overflow_x == CSS_OVERFLOW_SCROLL || + overflow_x == CSS_OVERFLOW_AUTO) ? + SCROLLBAR_WIDTH : 0; + int scrollbar_width_y = + (overflow_y == CSS_OVERFLOW_SCROLL || + overflow_y == CSS_OVERFLOW_AUTO) ? + SCROLLBAR_WIDTH : 0; - wtype = css_computed_width(box->style, &width, - &unit); + layout_find_dimensions(len_ctx, available_width, -1, box, style, + &width, &height, &max_width, &min_width, + &max_height, &min_height, margin, padding, border); - if (wtype == CSS_WIDTH_AUTO) { - /* max available width may be - * diminished due to floats. */ - int x0, x1, top; - struct box *left, *right; - top = cy + max_pos_margin - - max_neg_margin; - top = (top > y) ? top : y; - x0 = cx; - x1 = cx + box->parent->width - - box->parent->padding[LEFT] - - box->parent->padding[RIGHT]; - find_sides(block->float_children, - top, top, &x0, &x1, - &left, &right); - /* calculate min required left & right - * margins needed to avoid floats */ - lm = x0 - cx; - rm = cx + box->parent->width - - box->parent->padding[LEFT] - - box->parent->padding[RIGHT] - - x1; - } + if (margin[LEFT] == AUTO) + margin[LEFT] = 0; + if (margin[RIGHT] == AUTO) + margin[RIGHT] = 0; + + if (box->gadget == NULL) { + padding[RIGHT] += scrollbar_width_y; + padding[BOTTOM] += scrollbar_width_x; + } + + if (box->object && !(box->flags & REPLACE_DIM) && + content_get_type(box->object) != CONTENT_HTML) { + /* Floating replaced element, with intrinsic width or height. + * See 10.3.6 and 10.6.2 */ + layout_get_object_dimensions(box, &width, &height, + min_width, max_width, min_height, max_height); + } else if (box->gadget && (box->gadget->type == GADGET_TEXTBOX || + box->gadget->type == GADGET_PASSWORD || + box->gadget->type == GADGET_FILE || + box->gadget->type == GADGET_TEXTAREA)) { + css_fixed size = 0; + css_unit unit = CSS_UNIT_EM; + + /* Give sensible dimensions to gadgets, with auto width/height, + * that don't shrink to fit contained text. */ + assert(box->style); + + if (box->gadget->type == GADGET_TEXTBOX || + box->gadget->type == GADGET_PASSWORD || + box->gadget->type == GADGET_FILE) { + if (width == AUTO) { + size = INTTOFIX(10); + width = FIXTOINT(nscss_len2px(len_ctx, + size, unit, box->style)); + } + if (box->gadget->type == GADGET_FILE && + height == AUTO) { + size = FLTTOFIX(1.5); + height = FIXTOINT(nscss_len2px(len_ctx, + size, unit, box->style)); + } + } + if (box->gadget->type == GADGET_TEXTAREA) { + if (width == AUTO) { + size = INTTOFIX(10); + width = FIXTOINT(nscss_len2px(len_ctx, + size, unit, box->style)); + } + if (height == AUTO) { + size = INTTOFIX(4); + height = FIXTOINT(nscss_len2px(len_ctx, + size, unit, box->style)); } - if (!layout_table(box, box->parent->width - lm - rm, - content)) - return false; - layout_solve_width(box, box->parent->width, box->width, - lm, rm, -1, -1); } + } else if (width == AUTO) { + /* CSS 2.1 section 10.3.5 */ + width = min(max(box->min_width, available_width), + box->max_width); - /* Position box: horizontal. */ - box->x = box->parent->padding[LEFT] + box->margin[LEFT] + - box->border[LEFT].width; - cx += box->x; + /* width includes margin, borders and padding */ + if (width == available_width) { + width -= box->margin[LEFT] + box->border[LEFT].width + + box->padding[LEFT] + + box->padding[RIGHT] + + box->border[RIGHT].width + + box->margin[RIGHT]; + } else { + /* width was obtained from a min_width or max_width + * value, so need to use the same method for calculating + * mbp as was used in layout_minmax_block() */ + int fixed = 0; + float frac = 0; + calculate_mbp_width(len_ctx, box->style, LEFT, + true, true, true, &fixed, &frac); + calculate_mbp_width(len_ctx, box->style, RIGHT, + true, true, true, &fixed, &frac); + if (fixed < 0) + fixed = 0; - /* Position box: vertical. */ - if (box->border[TOP].width) { - box->y += box->border[TOP].width; - cy += box->border[TOP].width; + width -= fixed; } - /* Vertical margin */ - if (((box->type == BOX_BLOCK && - (box->flags & HAS_HEIGHT)) || - box->type == BOX_TABLE || - (box->type == BOX_INLINE_CONTAINER && - box != box->parent->children) || - margin_collapse == box) && - in_margin == true) { - /* Margin goes above this box. */ - cy += max_pos_margin - max_neg_margin; - box->y += max_pos_margin - max_neg_margin; + if (max_width >= 0 && width > max_width) width = max_width; + if (min_width > 0 && width < min_width) width = min_width; - /* Current margin has been applied. */ - in_margin = false; - max_pos_margin = max_neg_margin = 0; - } + } else { + if (max_width >= 0 && width > max_width) width = max_width; + if (min_width > 0 && width < min_width) width = min_width; + width -= scrollbar_width_y; + } - /* Handle clearance */ - if (box->type != BOX_INLINE_CONTAINER && - (y > 0) && (cy < y)) { - /* box clears something*/ - box->y += y - cy; - cy = y; - } + box->width = width; + box->height = height; - /* Unless the box has an overflow style of visible, the box - * establishes a new block context. */ - if (box->type == BOX_BLOCK && box->style && - (overflow_x != CSS_OVERFLOW_VISIBLE || - overflow_y != CSS_OVERFLOW_VISIBLE)) { + if (margin[TOP] == AUTO) + margin[TOP] = 0; + if (margin[BOTTOM] == AUTO) + margin[BOTTOM] = 0; +} - layout_block_context(box, viewport_height, content); - cy += box->padding[TOP]; +/** + * Layout the contents of a float or inline block. + * + * \param b float or inline block box + * \param width available width + * \param content memory pool for any new boxes + * \return true on success, false on memory exhaustion + */ +static bool layout_float(struct box *b, int width, html_content *content) +{ + assert(b->type == BOX_TABLE || b->type == BOX_BLOCK || + b->type == BOX_INLINE_BLOCK); + layout_float_find_dimensions(&content->len_ctx, width, b->style, b); + if (b->type == BOX_TABLE) { + if (!layout_table(b, width, content)) + return false; + if (b->margin[LEFT] == AUTO) + b->margin[LEFT] = 0; + if (b->margin[RIGHT] == AUTO) + b->margin[RIGHT] = 0; + if (b->margin[TOP] == AUTO) + b->margin[TOP] = 0; + if (b->margin[BOTTOM] == AUTO) + b->margin[BOTTOM] = 0; + } else + return layout_block_context(b, -1, content); + return true; +} - if (box->height == AUTO) { - box->height = 0; - layout_block_add_scrollbar(box, BOTTOM); - } - cx -= box->x; - cy += box->height + box->padding[BOTTOM] + - box->border[BOTTOM].width; - y = box->y + box->padding[TOP] + box->height + - box->padding[BOTTOM] + - box->border[BOTTOM].width; +/** + * Position a float in the first available space. + * + * \param c float box to position + * \param width available width + * \param cx x coordinate relative to cont to place float right of + * \param y y coordinate relative to cont to place float below + * \param cont ancestor box which defines horizontal space, for floats + */ +static void +place_float_below(struct box *c, int width, int cx, int y, struct box *cont) +{ + int x0, x1, yy; + struct box *left; + struct box *right; - /* Skip children, because they are done in the new - * block context */ - goto advance_to_next_box; + yy = y > cont->cached_place_below_level ? + y : cont->cached_place_below_level; + + NSLOG(layout, DEBUG, + "c %p, width %i, cx %i, y %i, cont %p", c, + width, cx, y, cont); + + do { + y = yy; + x0 = cx; + x1 = cx + width; + find_sides(cont->float_children, y, y + c->height, &x0, &x1, + &left, &right); + if (left != 0 && right != 0) { + yy = (left->y + left->height < + right->y + right->height ? + left->y + left->height : + right->y + right->height); + } else if (left == 0 && right != 0) { + yy = right->y + right->height; + } else if (left != 0 && right == 0) { + yy = left->y + left->height; } + } while ((left != 0 || right != 0) && (c->width > x1 - x0)); - NSLOG(layout, DEBUG, "box %p, cx %i, cy %i", box, cx, cy); + if (c->type == BOX_FLOAT_LEFT) { + c->x = x0; + } else { + c->x = x1 - c->width; + } + c->y = y; + cont->cached_place_below_level = y; +} - /* Layout (except tables). */ - if (box->object) { - if (!layout_block_object(box)) - return false; - } else if (box->type == BOX_INLINE_CONTAINER) { - box->width = box->parent->width; - if (!layout_inline_container(box, box->width, block, - cx, cy, content)) - return false; +/** + * Calculate line height from a style. + */ +static int line_height( + const nscss_len_ctx *len_ctx, + const css_computed_style *style) +{ + enum css_line_height_e lhtype; + css_fixed lhvalue = 0; + css_unit lhunit = CSS_UNIT_PX; + css_fixed line_height; - } else if (box->type == BOX_TABLE) { - /* Move down to avoid floats if necessary. */ - int x0, x1; - struct box *left, *right; - y = cy; - while (1) { - enum css_width_e wtype; - css_fixed width = 0; - css_unit unit = CSS_UNIT_PX; + assert(style); - wtype = css_computed_width(box->style, - &width, &unit); + lhtype = css_computed_line_height(style, &lhvalue, &lhunit); + if (lhtype == CSS_LINE_HEIGHT_NORMAL) { + /* Normal => use a constant of 1.3 * font-size */ + lhvalue = FLTTOFIX(1.3); + lhtype = CSS_LINE_HEIGHT_NUMBER; + } - x0 = cx; - x1 = cx + box->parent->width; - find_sides(block->float_children, y, - y + box->height, - &x0, &x1, &left, &right); - if (wtype == CSS_WIDTH_AUTO) - break; - if (box->width <= x1 - x0) - break; - if (!left && !right) - break; - else if (!left) - y = right->y + right->height + 1; - else if (!right) - y = left->y + left->height + 1; - else if (left->y + left->height < - right->y + right->height) - y = left->y + left->height + 1; - else - y = right->y + right->height + 1; - } - box->x += x0 - cx; - cx = x0; - box->y += y - cy; - cy = y; - } + if (lhtype == CSS_LINE_HEIGHT_NUMBER || + lhunit == CSS_UNIT_PCT) { + line_height = nscss_len2px(len_ctx, + lhvalue, CSS_UNIT_EM, style); - /* Advance to next box. */ - if (box->type == BOX_BLOCK && !box->object && !(box->iframe) && - box->children) { - /* Down into children. */ + if (lhtype != CSS_LINE_HEIGHT_NUMBER) + line_height = FDIV(line_height, F_100); + } else { + assert(lhunit != CSS_UNIT_PCT); - if (box == margin_collapse) { - /* Current margin collapsed though to this box. - * Unset margin_collapse. */ - margin_collapse = NULL; - } + line_height = nscss_len2px(len_ctx, + lhvalue, lhunit, style); + } - y = box->padding[TOP]; - box = box->children; - box->y = y; - cy += y; - continue; - } else if (box->type == BOX_BLOCK || box->object || - box->flags & IFRAME) - cy += box->padding[TOP]; + return FIXTOINT(line_height); +} - if (box->type == BOX_BLOCK && box->height == AUTO) { - box->height = 0; - layout_block_add_scrollbar(box, BOTTOM); - } - cy += box->height + box->padding[BOTTOM] + - box->border[BOTTOM].width; - cx -= box->x; - y = box->y + box->padding[TOP] + box->height + - box->padding[BOTTOM] + - box->border[BOTTOM].width; +/** + * Position a line of boxes in inline formatting context. + * + * \param first box at start of line + * \param width available width on input, updated with actual width on output + * (may be incorrect if the line gets split?) + * \param y coordinate of top of line, updated on exit to bottom + * \param cx coordinate of left of line relative to cont + * \param cy coordinate of top of line relative to cont + * \param cont ancestor box which defines horizontal space, for floats + * \param indent apply any first-line indent + * \param has_text_children at least one TEXT in the inline_container + * \param next_box updated to first box for next line, or 0 at end + * \param content memory pool for any new boxes + * \return true on success, false on memory exhaustion + */ +static bool +layout_line(struct box *first, + int *width, + int *y, + int cx, + int cy, + struct box *cont, + bool indent, + bool has_text_children, + html_content *content, + struct box **next_box) +{ + int height, used_height; + int x0 = 0; + int x1 = *width; + int x, h, x_previous; + int fy = cy; + struct box *left; + struct box *right; + struct box *b; + struct box *split_box = 0; + struct box *d; + struct box *br_box = 0; + bool move_y = false; + bool place_below = false; + int space_before = 0, space_after = 0; + unsigned int inline_count = 0; + unsigned int i; + const struct gui_layout_table *font_func = content->font_func; + plot_font_style_t fstyle; - advance_to_next_box: - if (!box->next) { - /* No more siblings: - * up to first ancestor with a sibling. */ + NSLOG(layout, DEBUG, + "first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i", + first, + (int)first->length, + first->text, + *width, + *y, + cx, + cy); - do { - if (box == margin_collapse) { - /* Current margin collapsed though to - * this box. Unset margin_collapse. */ - margin_collapse = NULL; - } + /* find sides at top of line */ + x0 += cx; + x1 += cx; + find_sides(cont->float_children, cy, cy, &x0, &x1, &left, &right); + x0 -= cx; + x1 -= cx; - /* Apply bottom margin */ - if (max_pos_margin < box->margin[BOTTOM]) - max_pos_margin = box->margin[BOTTOM]; - else if (max_neg_margin < -box->margin[BOTTOM]) - max_neg_margin = -box->margin[BOTTOM]; + if (indent) + x0 += layout_text_indent(&content->len_ctx, + first->parent->parent->style, *width); - box = box->parent; - if (box == block) - break; + if (x1 < x0) + x1 = x0; - /* Margin is invalidated if this is a box - * margins can't collapse through. */ - if (box->type == BOX_BLOCK && - box->flags & MAKE_HEIGHT) { - margin_collapse = NULL; - in_margin = false; - max_pos_margin = max_neg_margin = 0; - } + /* get minimum line height from containing block. + * this is the line-height if there are text children and also in the + * case of an initially empty text input */ + if (has_text_children || first->parent->parent->gadget) + used_height = height = line_height(&content->len_ctx, + first->parent->parent->style); + else + /* inline containers with no text are usually for layout and + * look better with no minimum line-height */ + used_height = height = 0; - if (box->height == AUTO) { - box->height = y - box->padding[TOP]; + /* pass 1: find height of line assuming sides at top of line: loop + * body executed at least once + * keep in sync with the loop in layout_minmax_line() */ - if (box->type == BOX_BLOCK) - layout_block_add_scrollbar(box, - BOTTOM); - } else - cy += box->height - - (y - box->padding[TOP]); + NSLOG(layout, DEBUG, "x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0); - /* Apply any min-height and max-height to - * boxes in normal flow */ - if (box->style && - css_computed_position(box->style) != - CSS_POSITION_ABSOLUTE && - layout_apply_minmax_height(box, - NULL)) { - /* Height altered */ - /* Set current cy */ - cy += box->height - - (y - box->padding[TOP]); - } - cy += box->padding[BOTTOM] + - box->border[BOTTOM].width; - cx -= box->x; - y = box->y + box->padding[TOP] + box->height + - box->padding[BOTTOM] + - box->border[BOTTOM].width; + for (x = 0, b = first; x <= x1 - x0 && b != 0; b = b->next) { + int min_width, max_width, min_height, max_height; - } while (box->next == NULL); - if (box == block) - break; - } + assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK || + b->type == BOX_FLOAT_LEFT || + b->type == BOX_FLOAT_RIGHT || + b->type == BOX_BR || b->type == BOX_TEXT || + b->type == BOX_INLINE_END); - /* To next sibling. */ - if (box == margin_collapse) { - /* Current margin collapsed though to this box. - * Unset margin_collapse. */ - margin_collapse = NULL; - } + NSLOG(layout, DEBUG, "pass 1: b %p, x %i", b, x); - if (max_pos_margin < box->margin[BOTTOM]) - max_pos_margin = box->margin[BOTTOM]; - else if (max_neg_margin < -box->margin[BOTTOM]) - max_neg_margin = -box->margin[BOTTOM]; - box = box->next; - box->y = y; - } + if (b->type == BOX_BR) + break; - /* Account for bottom margin of last contained block */ - cy += max_pos_margin - max_neg_margin; + if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) + continue; + if (b->type == BOX_INLINE_BLOCK && + (css_computed_position(b->style) == + CSS_POSITION_ABSOLUTE || + css_computed_position(b->style) == + CSS_POSITION_FIXED)) + continue; - /* Increase height to contain any floats inside (CSS 2.1 10.6.7). */ - for (box = block->float_children; box; box = box->next_float) { - y = box->y + box->height + box->padding[BOTTOM] + - box->border[BOTTOM].width + box->margin[BOTTOM]; - if (cy < y) - cy = y; - } + assert(b->style != NULL); + font_plot_style_from_css(&content->len_ctx, b->style, &fstyle); - if (block->height == AUTO) { - block->height = cy - block->padding[TOP]; - if (block->type == BOX_BLOCK) - layout_block_add_scrollbar(block, BOTTOM); - } + x += space_after; - if (block->style && css_computed_position(block->style) != - CSS_POSITION_ABSOLUTE) { - /* Block is in normal flow */ - layout_apply_minmax_height(block, NULL); - } + if (b->type == BOX_INLINE_BLOCK) { + if (b->max_width != UNKNOWN_WIDTH) + if (!layout_float(b, *width, content)) + return false; + h = b->border[TOP].width + b->padding[TOP] + b->height + + b->padding[BOTTOM] + + b->border[BOTTOM].width; + if (height < h) + height = h; + x += b->margin[LEFT] + b->border[LEFT].width + + b->padding[LEFT] + b->width + + b->padding[RIGHT] + + b->border[RIGHT].width + + b->margin[RIGHT]; + space_after = 0; + continue; + } - if (block->gadget && - (block->gadget->type == GADGET_TEXTAREA || - block->gadget->type == GADGET_PASSWORD || - block->gadget->type == GADGET_TEXTBOX)) { - int ta_width = block->padding[LEFT] + block->width + - block->padding[RIGHT]; - int ta_height = block->padding[TOP] + block->height + - block->padding[BOTTOM]; - textarea_set_layout(block->gadget->data.text.ta, - ta_width, ta_height, - block->padding[TOP], block->padding[RIGHT], - block->padding[BOTTOM], block->padding[LEFT]); - } - - return true; -} - - -/** - * Calculate line height from a style. - */ -static int line_height(const css_computed_style *style) -{ - enum css_line_height_e lhtype; - css_fixed lhvalue = 0; - css_unit lhunit = CSS_UNIT_PX; - css_fixed line_height; - - assert(style); - - lhtype = css_computed_line_height(style, &lhvalue, &lhunit); - if (lhtype == CSS_LINE_HEIGHT_NORMAL) { - /* Normal => use a constant of 1.3 * font-size */ - lhvalue = FLTTOFIX(1.3); - lhtype = CSS_LINE_HEIGHT_NUMBER; - } + if (b->type == BOX_INLINE) { + /* calculate borders, margins, and padding */ + layout_find_dimensions(&content->len_ctx, + *width, -1, b, b->style, 0, 0, 0, 0, + 0, 0, b->margin, b->padding, b->border); + for (i = 0; i != 4; i++) + if (b->margin[i] == AUTO) + b->margin[i] = 0; + x += b->margin[LEFT] + b->border[LEFT].width + + b->padding[LEFT]; + if (b->inline_end) { + b->inline_end->margin[RIGHT] = b->margin[RIGHT]; + b->inline_end->padding[RIGHT] = + b->padding[RIGHT]; + b->inline_end->border[RIGHT] = + b->border[RIGHT]; + } else { + x += b->padding[RIGHT] + + b->border[RIGHT].width + + b->margin[RIGHT]; + } + } else if (b->type == BOX_INLINE_END) { + b->width = 0; + if (b->space == UNKNOWN_WIDTH) { + font_func->width(&fstyle, " ", 1, &b->space); + /** \todo handle errors */ + } + space_after = b->space; - if (lhtype == CSS_LINE_HEIGHT_NUMBER || - lhunit == CSS_UNIT_PCT) { - line_height = nscss_len2px(lhvalue, CSS_UNIT_EM, style); + x += b->padding[RIGHT] + b->border[RIGHT].width + + b->margin[RIGHT]; + continue; + } - if (lhtype != CSS_LINE_HEIGHT_NUMBER) - line_height = FDIV(line_height, F_100); - } else { - assert(lhunit != CSS_UNIT_PCT); + if (!b->object && !(b->flags & IFRAME) && !b->gadget && + !(b->flags & REPLACE_DIM)) { + /* inline non-replaced, 10.3.1 and 10.6.1 */ + b->height = line_height(&content->len_ctx, + b->style ? b->style : + b->parent->parent->style); + if (height < b->height) + height = b->height; - line_height = nscss_len2px(lhvalue, lhunit, style); - } + if (!b->text) { + b->width = 0; + space_after = 0; + continue; + } - return FIXTOINT(line_height); -} + if (b->width == UNKNOWN_WIDTH) { + /** \todo handle errors */ + /* If it's a select element, we must use the + * width of the widest option text */ + if (b->parent->parent->gadget && + b->parent->parent->gadget->type + == GADGET_SELECT) { + int opt_maxwidth = 0; + struct form_option *o; -/** - * Layout list markers. - */ -static void -layout_lists(struct box *box, - const struct gui_layout_table *font_func) -{ - struct box *child; - struct box *marker; - plot_font_style_t fstyle; + for (o = b->parent->parent->gadget-> + data.select.items; o; + o = o->next) { + int opt_width; + font_func->width(&fstyle, + o->text, + strlen(o->text), + &opt_width); - for (child = box->children; child; child = child->next) { - if (child->list_marker) { - marker = child->list_marker; - if (marker->object) { - marker->width = - content_get_width(marker->object); - marker->x = -marker->width; - marker->height = - content_get_height(marker->object); - marker->y = (line_height(marker->style) - - marker->height) / 2; - } else if (marker->text) { - if (marker->width == UNKNOWN_WIDTH) { - font_plot_style_from_css(marker->style, - &fstyle); - font_func->width(&fstyle, - marker->text, - marker->length, - &marker->width); - marker->flags |= MEASURED; + if (opt_maxwidth < opt_width) + opt_maxwidth =opt_width; + } + b->width = opt_maxwidth; + if (nsoption_bool(core_select_menu)) + b->width += SCROLLBAR_WIDTH; + } else { + font_func->width(&fstyle, b->text, + b->length, &b->width); + b->flags |= MEASURED; } - marker->x = -marker->width; - marker->y = 0; - marker->height = line_height(marker->style); - } else { - marker->x = 0; - marker->y = 0; - marker->width = 0; - marker->height = 0; } - /* Gap between marker and content */ - marker->x -= 4; - } - layout_lists(child, font_func); - } -} - - -/** - * Compute box offsets for a relatively or absolutely positioned box with - * respect to a box. - * - * \param box box to compute offsets for - * \param containing_block box to compute percentages with respect to - * \param top updated to top offset, or AUTO - * \param right updated to right offset, or AUTO - * \param bottom updated to bottom offset, or AUTO - * \param left updated to left offset, or AUTO - * - * See CSS 2.1 9.3.2. containing_block must have width and height. - */ -static void -layout_compute_offsets(struct box *box, - struct box *containing_block, - int *top, - int *right, - int *bottom, - int *left) -{ - uint32_t type; - css_fixed value = 0; - css_unit unit = CSS_UNIT_PX; - - assert(containing_block->width != UNKNOWN_WIDTH && - containing_block->width != AUTO && - containing_block->height != AUTO); - /* left */ - type = css_computed_left(box->style, &value, &unit); - if (type == CSS_LEFT_SET) { - if (unit == CSS_UNIT_PCT) { - *left = FPCT_OF_INT_TOINT(value, - containing_block->width); - } else { - *left = FIXTOINT(nscss_len2px(value, unit, box->style)); - } - } else { - *left = AUTO; - } + /* If the current text has not been measured (i.e. its + * width was estimated after splitting), and it fits on + * the line, measure it properly, so next box is placed + * correctly. */ + if (b->text && (x + b->width < x1 - x0) && + !(b->flags & MEASURED) && + b->next) { + font_func->width(&fstyle, b->text, + b->length, &b->width); + b->flags |= MEASURED; + } - /* right */ - type = css_computed_right(box->style, &value, &unit); - if (type == CSS_RIGHT_SET) { - if (unit == CSS_UNIT_PCT) { - *right = FPCT_OF_INT_TOINT(value, - containing_block->width); - } else { - *right = FIXTOINT(nscss_len2px(value, unit, - box->style)); + x += b->width; + if (b->space == UNKNOWN_WIDTH) { + font_func->width(&fstyle, " ", 1, &b->space); + /** \todo handle errors */ + } + space_after = b->space; + continue; } - } else { - *right = AUTO; - } - /* top */ - type = css_computed_top(box->style, &value, &unit); - if (type == CSS_TOP_SET) { - if (unit == CSS_UNIT_PCT) { - *top = FPCT_OF_INT_TOINT(value, - containing_block->height); - } else { - *top = FIXTOINT(nscss_len2px(value, unit, box->style)); - } - } else { - *top = AUTO; - } + space_after = 0; - /* bottom */ - type = css_computed_bottom(box->style, &value, &unit); - if (type == CSS_BOTTOM_SET) { - if (unit == CSS_UNIT_PCT) { - *bottom = FPCT_OF_INT_TOINT(value, - containing_block->height); - } else { - *bottom = FIXTOINT(nscss_len2px(value, unit, - box->style)); - } - } else { - *bottom = AUTO; - } -} + /* inline replaced, 10.3.2 and 10.6.2 */ + assert(b->style); + layout_find_dimensions(&content->len_ctx, + *width, -1, b, b->style, + &b->width, &b->height, + &max_width, &min_width, + &max_height, &min_height, + NULL, NULL, NULL); -/** - * Layout and position an absolutely positioned box. - * - * \param box absolute box to layout and position - * \param containing_block containing block - * \param cx position of box relative to containing_block - * \param cy position of box relative to containing_block - * \param content memory pool for any new boxes - * \return true on success, false on memory exhaustion - */ -static bool -layout_absolute(struct box *box, - struct box *containing_block, - int cx, int cy, - html_content *content) -{ - int static_left, static_top; /* static position */ - int top, right, bottom, left; - int width, height, max_width, min_width; - int *margin = box->margin; - int *padding = box->padding; - struct box_border *border = box->border; - int available_width = containing_block->width; - int space; - - assert(box->type == BOX_BLOCK || box->type == BOX_TABLE || - box->type == BOX_INLINE_BLOCK); - - /* The static position is where the box would be if it was not - * absolutely positioned. The x and y are filled in by - * layout_block_context(). */ - static_left = cx + box->x; - static_top = cy + box->y; - - if (containing_block->type == BOX_BLOCK || - containing_block->type == BOX_INLINE_BLOCK || - containing_block->type == BOX_TABLE_CELL) { - /* Block level container => temporarily increase containing - * block dimensions to include padding (we restore this - * again at the end) */ - containing_block->width += containing_block->padding[LEFT] + - containing_block->padding[RIGHT]; - containing_block->height += containing_block->padding[TOP] + - containing_block->padding[BOTTOM]; - } else { - /** \todo inline containers */ - } - - layout_compute_offsets(box, containing_block, - &top, &right, &bottom, &left); - - /* Pass containing block into layout_find_dimensions via the float - * containing block box member. This is unused for absolutely positioned - * boxes because a box can't be floated and absolutely positioned. */ - box->float_container = containing_block; - layout_find_dimensions(available_width, -1, box, box->style, - &width, &height, &max_width, &min_width, - 0, 0, margin, padding, border); - box->float_container = NULL; - - /* 10.3.7 */ - NSLOG(layout, DEBUG, - "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", - left, margin[LEFT], border[LEFT].width, padding[LEFT], width, - padding[RIGHT], border[RIGHT].width, margin[RIGHT], right, - containing_block->width); - - - if (left == AUTO && width == AUTO && right == AUTO) { - if (margin[LEFT] == AUTO) - margin[LEFT] = 0; - if (margin[RIGHT] == AUTO) - margin[RIGHT] = 0; - left = static_left; - - width = min(max(box->min_width, available_width), - box->max_width); - width -= box->margin[LEFT] + box->border[LEFT].width + - box->padding[LEFT] + box->padding[RIGHT] + - box->border[RIGHT].width + box->margin[RIGHT]; - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) width = max_width; - if (width < min_width) width = min_width; - - right = containing_block->width - - left - - margin[LEFT] - border[LEFT].width - padding[LEFT] - - width - - padding[RIGHT] - border[RIGHT].width - margin[RIGHT]; - } else if (left != AUTO && width != AUTO && right != AUTO) { - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) width = max_width; - if (min_width > 0 && width < min_width) width = min_width; - - if (margin[LEFT] == AUTO && margin[RIGHT] == AUTO) { - space = containing_block->width - - left - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - right; - if (space < 0) { - margin[LEFT] = 0; - margin[RIGHT] = space; - } else { - margin[LEFT] = margin[RIGHT] = space / 2; - } - } else if (margin[LEFT] == AUTO) { - margin[LEFT] = containing_block->width - - left - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT] - - right; - } else if (margin[RIGHT] == AUTO) { - margin[RIGHT] = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - right; - } else { - right = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT]; - } - } else { - if (margin[LEFT] == AUTO) - margin[LEFT] = 0; - if (margin[RIGHT] == AUTO) - margin[RIGHT] = 0; - - if (left == AUTO && width == AUTO && right != AUTO) { - available_width -= right; - - width = min(max(box->min_width, available_width), - box->max_width); - width -= box->margin[LEFT] + box->border[LEFT].width + - box->padding[LEFT] + box->padding[RIGHT] + - box->border[RIGHT].width + box->margin[RIGHT]; - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (width < min_width) - width = min_width; - - left = containing_block->width - - margin[LEFT] - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT] - - right; - } else if (left == AUTO && width != AUTO && right == AUTO) { - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (min_width > 0 && width < min_width) - width = min_width; - - left = static_left; - right = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT]; - } else if (left != AUTO && width == AUTO && right == AUTO) { - available_width -= left; - - width = min(max(box->min_width, available_width), - box->max_width); - width -= box->margin[LEFT] + box->border[LEFT].width + - box->padding[LEFT] + box->padding[RIGHT] + - box->border[RIGHT].width + box->margin[RIGHT]; - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (width < min_width) - width = min_width; - - right = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT]; - } else if (left == AUTO && width != AUTO && right != AUTO) { - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (width < min_width) - width = min_width; - - left = containing_block->width - - margin[LEFT] - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT] - - right; - } else if (left != AUTO && width == AUTO && right != AUTO) { - width = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT] - - right; - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (width < min_width) - width = min_width; - - } else if (left != AUTO && width != AUTO && right == AUTO) { - - /* Adjust for {min|max}-width */ - if (max_width >= 0 && width > max_width) - width = max_width; - if (width < min_width) - width = min_width; - - right = containing_block->width - - left - margin[LEFT] - - border[LEFT].width - - padding[LEFT] - width - padding[RIGHT] - - border[RIGHT].width - margin[RIGHT]; - } - } - - NSLOG(layout, DEBUG, - "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", - left, margin[LEFT], border[LEFT].width, padding[LEFT], width, - padding[RIGHT], border[RIGHT].width, margin[RIGHT], right, - containing_block->width); - - box->x = left + margin[LEFT] + border[LEFT].width - cx; - if (containing_block->type == BOX_BLOCK || - containing_block->type == BOX_INLINE_BLOCK || - containing_block->type == BOX_TABLE_CELL) { - /* Block-level ancestor => reset container's width */ - containing_block->width -= containing_block->padding[LEFT] + - containing_block->padding[RIGHT]; - } else { - /** \todo inline ancestors */ - } - box->width = width; - box->height = height; - - if (box->type == BOX_BLOCK || box->type == BOX_INLINE_BLOCK || - box->object || box->flags & IFRAME) { - if (!layout_block_context(box, -1, content)) - return false; - } else if (box->type == BOX_TABLE) { - /* layout_table also expects the containing block to be - * stored in the float_container field */ - box->float_container = containing_block; - /* \todo layout_table considers margins etc. again */ - if (!layout_table(box, width, content)) - return false; - box->float_container = NULL; - layout_solve_width(box, box->parent->width, box->width, 0, 0, - -1, -1); - } - - /* 10.6.4 */ - NSLOG(layout, DEBUG, - "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", - top, margin[TOP], border[TOP].width, padding[TOP], height, - padding[BOTTOM], border[BOTTOM].width, margin[BOTTOM], bottom, - containing_block->height); - - if (top == AUTO && height == AUTO && bottom == AUTO) { - top = static_top; - height = box->height; - if (margin[TOP] == AUTO) - margin[TOP] = 0; - if (margin[BOTTOM] == AUTO) - margin[BOTTOM] = 0; - bottom = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - padding[BOTTOM] - - border[BOTTOM].width - margin[BOTTOM]; - } else if (top != AUTO && height != AUTO && bottom != AUTO) { - if (margin[TOP] == AUTO && margin[BOTTOM] == AUTO) { - space = containing_block->height - - top - border[TOP].width - padding[TOP] - - height - padding[BOTTOM] - - border[BOTTOM].width - bottom; - margin[TOP] = margin[BOTTOM] = space / 2; - } else if (margin[TOP] == AUTO) { - margin[TOP] = containing_block->height - - top - border[TOP].width - padding[TOP] - - height - padding[BOTTOM] - - border[BOTTOM].width - margin[BOTTOM] - - bottom; - } else if (margin[BOTTOM] == AUTO) { - margin[BOTTOM] = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - bottom; - } else { - bottom = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM]; - } - } else { - if (margin[TOP] == AUTO) - margin[TOP] = 0; - if (margin[BOTTOM] == AUTO) - margin[BOTTOM] = 0; - if (top == AUTO && height == AUTO && bottom != AUTO) { - height = box->height; - top = containing_block->height - - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM] - bottom; - } else if (top == AUTO && height != AUTO && bottom == AUTO) { - top = static_top; - bottom = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM]; - } else if (top != AUTO && height == AUTO && bottom == AUTO) { - height = box->height; - bottom = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM]; - } else if (top == AUTO && height != AUTO && bottom != AUTO) { - top = containing_block->height - - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM] - bottom; - } else if (top != AUTO && height == AUTO && bottom != AUTO) { - height = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - padding[BOTTOM] - - border[BOTTOM].width - margin[BOTTOM] - - bottom; - } else if (top != AUTO && height != AUTO && bottom == AUTO) { - bottom = containing_block->height - - top - margin[TOP] - border[TOP].width - - padding[TOP] - height - - padding[BOTTOM] - border[BOTTOM].width - - margin[BOTTOM]; - } - } - - NSLOG(layout, DEBUG, - "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", - top, margin[TOP], border[TOP].width, padding[TOP], height, - padding[BOTTOM], border[BOTTOM].width, margin[BOTTOM], bottom, - containing_block->height); - - box->y = top + margin[TOP] + border[TOP].width - cy; - if (containing_block->type == BOX_BLOCK || - containing_block->type == BOX_INLINE_BLOCK || - containing_block->type == BOX_TABLE_CELL) { - /* Block-level ancestor => reset container's height */ - containing_block->height -= containing_block->padding[TOP] + - containing_block->padding[BOTTOM]; - } else { - /** \todo Inline ancestors */ - } - box->height = height; - layout_apply_minmax_height(box, containing_block); - - return true; -} - - -/** - * Recursively layout and position absolutely positioned boxes. - * - * \param box tree of boxes to layout - * \param containing_block current containing block - * \param cx position of box relative to containing_block - * \param cy position of box relative to containing_block - * \param content memory pool for any new boxes - * \return true on success, false on memory exhaustion - */ -static bool -layout_position_absolute(struct box *box, - struct box *containing_block, - int cx, int cy, - html_content *content) -{ - struct box *c; - - for (c = box->children; c; c = c->next) { - if ((c->type == BOX_BLOCK || c->type == BOX_TABLE || - c->type == BOX_INLINE_BLOCK) && - (css_computed_position(c->style) == - CSS_POSITION_ABSOLUTE || - css_computed_position(c->style) == - CSS_POSITION_FIXED)) { - if (!layout_absolute(c, containing_block, - cx, cy, content)) - return false; - if (!layout_position_absolute(c, c, 0, 0, content)) - return false; - } else if (c->style && css_computed_position(c->style) == - CSS_POSITION_RELATIVE) { - if (!layout_position_absolute(c, c, 0, 0, content)) - return false; - } else { - int px, py; - if (c->style && (css_computed_float(c->style) == - CSS_FLOAT_LEFT || - css_computed_float(c->style) == - CSS_FLOAT_RIGHT)) { - /* Float x/y coords are relative to nearest - * ansestor with float_children, rather than - * relative to parent. Need to get x/y relative - * to parent */ - struct box *p; - px = c->x; - py = c->y; - for (p = box->parent; p && !p->float_children; - p = p->parent) { - px -= p->x; - py -= p->y; - } - } else { - /* Not a float, so box x/y coords are relative - * to parent */ - px = c->x; - py = c->y; - } - if (!layout_position_absolute(c, containing_block, - cx + px, cy + py, content)) - return false; + if (b->object && !(b->flags & REPLACE_DIM)) { + layout_get_object_dimensions(b, &b->width, &b->height, + min_width, max_width, + min_height, max_height); + } else if (b->flags & IFRAME) { + /* TODO: should we look at the content dimensions? */ + if (b->width == AUTO) + b->width = 400; + if (b->height == AUTO) + b->height = 300; + + /* We reformat the iframe browser window to new + * dimensions in pass 2 */ + } else { + /* form control with no object */ + if (b->width == AUTO) + b->width = FIXTOINT(nscss_len2px( + &content->len_ctx, INTTOFIX(1), + CSS_UNIT_EM, b->style)); + if (b->height == AUTO) + b->height = FIXTOINT(nscss_len2px( + &content->len_ctx, INTTOFIX(1), + CSS_UNIT_EM, b->style)); } - } - return true; -} + /* Reformat object to new box size */ + if (b->object && content_get_type(b->object) == CONTENT_HTML && + b->width != + content_get_available_width(b->object)) { + css_fixed value = 0; + css_unit unit = CSS_UNIT_PX; + enum css_height_e htype = css_computed_height(b->style, + &value, &unit); + content_reformat(b->object, false, b->width, b->height); -/** - * Compute a box's relative offset as per CSS 2.1 9.4.3 - * - * \param box Box to compute relative offsets for. - * \param x Receives relative offset in x. - * \param y Receives relative offset in y. - */ -static void layout_compute_relative_offset(struct box *box, int *x, int *y) -{ - int left, right, top, bottom; - struct box *containing_block; + if (htype == CSS_HEIGHT_AUTO) + b->height = content_get_height(b->object); + } - assert(box && box->parent && box->style && - css_computed_position(box->style) == - CSS_POSITION_RELATIVE); + if (height < b->height) + height = b->height; - if (box->float_container && - (css_computed_float(box->style) == CSS_FLOAT_LEFT || - css_computed_float(box->style) == CSS_FLOAT_RIGHT)) { - containing_block = box->float_container; - } else { - containing_block = box->parent; + x += b->width; } - layout_compute_offsets(box, containing_block, - &top, &right, &bottom, &left); + /* find new sides using this height */ + x0 = cx; + x1 = cx + *width; + find_sides(cont->float_children, cy, cy + height, &x0, &x1, + &left, &right); + x0 -= cx; + x1 -= cx; - if (left == AUTO && right == AUTO) - left = right = 0; - else if (left == AUTO) - /* left is auto => computed = -right */ - left = -right; - else if (right == AUTO) - /* right is auto => computed = -left */ - right = -left; - else { - /* over constrained => examine direction property - * of containing block */ - if (containing_block->style && - css_computed_direction( - containing_block->style) == - CSS_DIRECTION_RTL) { - /* right wins */ - left = -right; - } else { - /* assume LTR in all other cases */ - right = -left; - } - } + if (indent) + x0 += layout_text_indent(&content->len_ctx, + first->parent->parent->style, *width); - assert(left == -right); + if (x1 < x0) + x1 = x0; - if (top == AUTO && bottom == AUTO) { - top = bottom = 0; - } else if (top == AUTO) { - top = -bottom; - } else { - /* bottom is AUTO, or neither are AUTO */ - bottom = -top; - } + space_after = space_before = 0; - NSLOG(layout, DEBUG, "left %i, right %i, top %i, bottom %i", left, - right, top, bottom); + /* pass 2: place boxes in line: loop body executed at least once */ - *x = left; - *y = top; -} + NSLOG(layout, DEBUG, "x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0); + for (x = x_previous = 0, b = first; x <= x1 - x0 && b; b = b->next) { -/** - * Adjust positions of relatively positioned boxes. - * - * \param root box to adjust the position of - * \param fp box which forms the block formatting context for children of - * "root" which are floats - * \param fx x offset due to intervening relatively positioned boxes - * between current box, "root", and the block formatting context - * box, "fp", for float children of "root" - * \param fy y offset due to intervening relatively positioned boxes - * between current box, "root", and the block formatting context - * box, "fp", for float children of "root" - */ -static void -layout_position_relative(struct box *root, struct box *fp, int fx, int fy) -{ - struct box *box; /* for children of "root" */ - struct box *fn; /* for block formatting context box for children of - * "box" */ - struct box *fc; /* for float children of the block formatting context, - * "fp" */ - int x, y; /* for the offsets resulting from any relative - * positioning on the current block */ - int fnx, fny; /* for affsets which apply to flat children of "box" */ + NSLOG(layout, DEBUG, "pass 2: b %p, x %i", b, x); - /**\todo ensure containing box is large enough after moving boxes */ + if (b->type == BOX_INLINE_BLOCK && + (css_computed_position(b->style) == + CSS_POSITION_ABSOLUTE || + css_computed_position(b->style) == + CSS_POSITION_FIXED)) { + b->x = x + space_after; - assert(root); + } else if (b->type == BOX_INLINE || + b->type == BOX_INLINE_BLOCK || + b->type == BOX_TEXT || + b->type == BOX_INLINE_END) { + assert(b->width != UNKNOWN_WIDTH); - /* Normal children */ - for (box = root->children; box; box = box->next) { + x_previous = x; + x += space_after; + b->x = x; - if (box->type == BOX_TEXT) - continue; + if ((b->type == BOX_INLINE && !b->inline_end) || + b->type == BOX_INLINE_BLOCK) { + b->x += b->margin[LEFT] + b->border[LEFT].width; + x = b->x + b->padding[LEFT] + b->width + + b->padding[RIGHT] + + b->border[RIGHT].width + + b->margin[RIGHT]; + } else if (b->type == BOX_INLINE) { + b->x += b->margin[LEFT] + b->border[LEFT].width; + x = b->x + b->padding[LEFT] + b->width; + } else if (b->type == BOX_INLINE_END) { + b->height = b->inline_end->height; + x += b->padding[RIGHT] + + b->border[RIGHT].width + + b->margin[RIGHT]; + } else { + x += b->width; + } + + space_before = space_after; + if (b->object || b->flags & REPLACE_DIM || + b->flags & IFRAME) + space_after = 0; + else if (b->text || b->type == BOX_INLINE_END) { + if (b->space == UNKNOWN_WIDTH) { + font_plot_style_from_css( + &content->len_ctx, + b->style, &fstyle); + /** \todo handle errors */ + font_func->width(&fstyle, " ", 1, + &b->space); + } + space_after = b->space; + } else { + space_after = 0; + } + split_box = b; + move_y = true; + inline_count++; + } else if (b->type == BOX_BR) { + b->x = x; + b->width = 0; + br_box = b; + b = b->next; + split_box = 0; + move_y = true; + break; + + } else { + /* float */ + NSLOG(layout, DEBUG, "float %p", b); + + d = b->children; + d->float_children = 0; + d->cached_place_below_level = 0; + b->float_container = d->float_container = cont; + + if (!layout_float(d, *width, content)) + return false; + + NSLOG(layout, DEBUG, + "%p : %d %d", + d, + d->margin[TOP], + d->border[TOP].width); + + d->x = d->margin[LEFT] + d->border[LEFT].width; + d->y = d->margin[TOP] + d->border[TOP].width; + b->width = d->margin[LEFT] + d->border[LEFT].width + + d->padding[LEFT] + d->width + + d->padding[RIGHT] + + d->border[RIGHT].width + + d->margin[RIGHT]; + b->height = d->margin[TOP] + d->border[TOP].width + + d->padding[TOP] + d->height + + d->padding[BOTTOM] + + d->border[BOTTOM].width + + d->margin[BOTTOM]; + + if (b->width > (x1 - x0) - x) + place_below = true; + if (d->style && (css_computed_clear(d->style) == + CSS_CLEAR_NONE || + (css_computed_clear(d->style) == + CSS_CLEAR_LEFT && left == 0) || + (css_computed_clear(d->style) == + CSS_CLEAR_RIGHT && + right == 0) || + (css_computed_clear(d->style) == + CSS_CLEAR_BOTH && + left == 0 && right == 0)) && + (!place_below || + (left == 0 && right == 0 && x == 0)) && + cy >= cont->clear_level && + cy >= cont->cached_place_below_level) { + /* + not cleared or, + * cleared and there are no floats to clear + * + fits without needing to be placed below or, + * this line is empty with no floats + * + current y, cy, is below the clear level + * + * Float affects current line */ + if (b->type == BOX_FLOAT_LEFT) { + b->x = cx + x0; + if (b->width > 0) + x0 += b->width; + left = b; + } else { + b->x = cx + x1 - b->width; + if (b->width > 0) + x1 -= b->width; + right = b; + } + b->y = cy; + } else { + /* cleared or doesn't fit on line */ + /* place below into next available space */ + int fcy = (cy > cont->clear_level) ? cy : + cont->clear_level; + fcy = (fcy > cont->cached_place_below_level) ? + fcy : + cont->cached_place_below_level; + fy = (fy > fcy) ? fy : fcy; + fy = (fy == cy) ? fy + height : fy; - /* If relatively positioned, get offsets */ - if (box->style && css_computed_position(box->style) == - CSS_POSITION_RELATIVE) - layout_compute_relative_offset(box, &x, &y); - else - x = y = 0; + place_float_below(b, *width, cx, fy, cont); + fy = b->y; + if (d->style && ( + (css_computed_clear(d->style) == + CSS_CLEAR_LEFT && left != 0) || + (css_computed_clear(d->style) == + CSS_CLEAR_RIGHT && + right != 0) || + (css_computed_clear(d->style) == + CSS_CLEAR_BOTH && + (left != 0 || right != 0)))) { + /* to be cleared below existing + * floats */ + if (b->type == BOX_FLOAT_LEFT) + b->x = cx; + else + b->x = cx + *width - b->width; - /* Adjust float coordinates. - * (note float x and y are relative to their block formatting - * context box and not their parent) */ - if (box->style && (css_computed_float(box->style) == - CSS_FLOAT_LEFT || - css_computed_float(box->style) == - CSS_FLOAT_RIGHT) && - (fx != 0 || fy != 0)) { - /* box is a float and there is a float offset to - * apply */ - for (fc = fp->float_children; fc; fc = fc->next_float) { - if (box == fc->children) { - /* Box is floated in the block - * formatting context block, fp. - * Apply float offsets. */ - box->x += fx; - box->y += fy; - fx = fy = 0; + fcy = layout_clear(cont->float_children, + css_computed_clear(d->style)); + if (fcy > cont->clear_level) + cont->clear_level = fcy; + if (b->y < fcy) + b->y = fcy; } + if (b->type == BOX_FLOAT_LEFT) + left = b; + else + right = b; } - } - - if (box->float_children) { - fn = box; - fnx = fny = 0; - } else { - fn = fp; - fnx = fx + x; - fny = fy + y; - } - - /* recurse first */ - layout_position_relative(box, fn, fnx, fny); - - /* Ignore things we're not interested in. */ - if (!box->style || (box->style && - css_computed_position(box->style) != - CSS_POSITION_RELATIVE)) - continue; - - box->x += x; - box->y += y; + add_float_to_container(cont, b); - /* Handle INLINEs - their "children" are in fact - * the sibling boxes between the INLINE and - * INLINE_END boxes */ - if (box->type == BOX_INLINE && box->inline_end) { - struct box *b; - for (b = box->next; b && b != box->inline_end; - b = b->next) { - b->x += x; - b->y += y; - } + split_box = 0; } } -} - - -/* exported function documented in render/layout.h */ -bool layout_document(html_content *content, int width, int height) -{ - bool ret; - struct box *doc = content->layout; - const struct gui_layout_table *font_func = content->font_func; - - layout_minmax_block(doc, font_func); - layout_block_find_dimensions(width, height, 0, 0, doc); - doc->x = doc->margin[LEFT] + doc->border[LEFT].width; - doc->y = doc->margin[TOP] + doc->border[TOP].width; - width -= doc->margin[LEFT] + doc->border[LEFT].width + - doc->padding[LEFT] + doc->padding[RIGHT] + - doc->border[RIGHT].width + doc->margin[RIGHT]; - if (width < 0) { - width = 0; - } - doc->width = width; + if (x1 - x0 < x && split_box) { + /* the last box went over the end */ + size_t split = 0; + int w; + bool no_wrap = css_computed_white_space( + split_box->style) == CSS_WHITE_SPACE_NOWRAP || + css_computed_white_space( + split_box->style) == CSS_WHITE_SPACE_PRE; - ret = layout_block_context(doc, height, content); + x = x_previous; - /* make <html> and <body> fill available height */ - if (doc->y + doc->padding[TOP] + doc->height + doc->padding[BOTTOM] + - doc->border[BOTTOM].width + doc->margin[BOTTOM] < - height) { - doc->height = height - (doc->y + doc->padding[TOP] + - doc->padding[BOTTOM] + - doc->border[BOTTOM].width + - doc->margin[BOTTOM]); - if (doc->children) - doc->children->height = doc->height - - (doc->children->margin[TOP] + - doc->children->border[TOP].width + - doc->children->padding[TOP] + - doc->children->padding[BOTTOM] + - doc->children->border[BOTTOM].width + - doc->children->margin[BOTTOM]); - } + if (!no_wrap && + (split_box->type == BOX_INLINE || + split_box->type == BOX_TEXT) && + !split_box->object && + !(split_box->flags & REPLACE_DIM) && + !(split_box->flags & IFRAME) && + !split_box->gadget && split_box->text) { - layout_lists(doc, font_func); - layout_position_absolute(doc, doc, 0, 0, content); - layout_position_relative(doc, doc, 0, 0); + font_plot_style_from_css(&content->len_ctx, + split_box->style, &fstyle); + /** \todo handle errors */ + font_func->split(&fstyle, + split_box->text, + split_box->length, + x1 - x0 - x - space_before, + &split, + &w); + } - layout_calculate_descendant_bboxes(doc); + /* split == 0 implies that text can't be split */ - return ret; -} + if (split == 0) + w = split_box->width; -/** - * Insert a float into a container. - * - * \param cont block formatting context block, used to contain float - * \param b box to add to float - * - * This sorts floats in order of descending bottom edges. - */ -static void add_float_to_container(struct box *cont, struct box *b) -{ - struct box *box = cont->float_children; - int b_bottom = b->y + b->height; + NSLOG(layout, DEBUG, + "splitting: split_box %p \"%.*s\", spilt %zu, w %i, " + "left %p, right %p, inline_count %u", + split_box, + (int)split_box->length, + split_box->text, + split, + w, + left, + right, + inline_count); - assert(b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT); + if ((split == 0 || x1 - x0 <= x + space_before + w) && + !left && !right && inline_count == 1) { + /* first word of box doesn't fit, but no floats and + * first box on line so force in */ + if (split == 0 || split == split_box->length) { + /* only one word in this box, or not text + * or white-space:nowrap */ + b = split_box->next; + } else { + /* cut off first word for this line */ + if (!layout_text_box_split(content, &fstyle, + split_box, split, w)) + return false; + b = split_box->next; + } + x += space_before + w; - if (box == NULL) { - /* No other float children */ - b->next_float = NULL; - cont->float_children = b; - return; - } else if (b_bottom >= box->y + box->height) { - /* Goes at start of list */ - b->next_float = cont->float_children; - cont->float_children = b; - } else { - struct box *prev = NULL; - while (box != NULL && b_bottom < box->y + box->height) { - prev = box; - box = box->next_float; - } - if (prev != NULL) { - b->next_float = prev->next_float; - prev->next_float = b; - } - } -} + NSLOG(layout, DEBUG, "forcing"); + } else if ((split == 0 || x1 - x0 <= x + space_before + w) && + inline_count == 1) { + /* first word of first box doesn't fit, but a float is + * taking some of the width so move below it */ + assert(left || right); + used_height = 0; + if (left) { -/** - * Split a text box. - * - * \param content memory pool for any new boxes - * \param fstyle style for text in text box - * \param split_box box with text to split - * \param new_length new length for text in split_box, after splitting - * \param new_width new width for text in split_box, after splitting - * \return true on success, false on memory exhaustion - * - * A new box is created and inserted into the box tree after split_box, - * containing the text after new_length excluding the initial space character. - */ -static bool -layout_text_box_split(html_content *content, - plot_font_style_t *fstyle, - struct box *split_box, - size_t new_length, - int new_width) -{ - int space_width = split_box->space; - struct box *c2; - const struct gui_layout_table *font_func = content->font_func; - bool space = (split_box->text[new_length] == ' '); - int used_length = new_length + (space ? 1 : 0); + NSLOG(layout, DEBUG, + "cy %i, left->y %i, left->height %i", + cy, + left->y, + left->height); - if ((space && space_width == 0) || space_width == UNKNOWN_WIDTH) { - /* We're need to add a space, and we don't know how big - * it's to be, OR we have a space of unknown width anyway; - * Calculate space width */ - font_func->width(fstyle, " ", 1, &space_width); - } + used_height = left->y + left->height - cy + 1; - if (split_box->space == UNKNOWN_WIDTH) - split_box->space = space_width; - if (!space) - space_width = 0; + NSLOG(layout, DEBUG, "used_height %i", + used_height); - /* Create clone of split_box, c2 */ - c2 = talloc_memdup(content->bctx, split_box, sizeof *c2); - if (!c2) - return false; - c2->flags |= CLONE; + } + if (right && used_height < + right->y + right->height - cy + 1) + used_height = right->y + right->height - cy + 1; - /* Set remaining text in c2 */ - c2->text += used_length; + if (used_height < 0) + used_height = 0; - /* Set c2 according to the remaining text */ - c2->width -= new_width + space_width; - c2->flags &= ~MEASURED; /* width has been estimated */ - c2->length = split_box->length - used_length; + b = split_box; - /* Update split_box for its reduced text */ - split_box->width = new_width; - split_box->flags |= MEASURED; - split_box->length = new_length; - split_box->space = space_width; + NSLOG(layout, DEBUG, "moving below float"); - /* Insert c2 into box list */ - c2->next = split_box->next; - split_box->next = c2; - c2->prev = split_box; - if (c2->next) - c2->next->prev = c2; - else - c2->parent->last = c2; + } else if (split == 0 || x1 - x0 <= x + space_before + w) { + /* first word of box doesn't fit so leave box for next + * line */ + b = split_box; - NSLOG(layout, DEBUG, - "split_box %p len: %" PRIsizet " \"%.*s\"", - split_box, - split_box->length, - (int)split_box->length, - split_box->text); - NSLOG(layout, DEBUG, - " new_box %p len: %" PRIsizet " \"%.*s\"", - c2, - c2->length, - (int)c2->length, - c2->text); + NSLOG(layout, DEBUG, "leaving for next line"); - return true; -} + } else { + /* fit as many words as possible */ + assert(split != 0); + NSLOG(layout, DEBUG, "'%.*s' %i %zu %i", + (int)split_box->length, split_box->text, + x1 - x0, split, w); -/** - * Compute dimensions of box, margins, paddings, and borders for a floating - * element using shrink-to-fit. Also used for inline-blocks. - * - * \param available_width Max width available in pixels - * \param style Box's style - * \param box Box for which to find dimensions - * Box margins, borders, paddings, width and - * height are updated. - */ -static void -layout_float_find_dimensions(int available_width, - const css_computed_style *style, - struct box *box) -{ - int width, height, max_width, min_width, max_height, min_height; - int *margin = box->margin; - int *padding = box->padding; - struct box_border *border = box->border; - enum css_overflow_e overflow_x = css_computed_overflow_x(style); - enum css_overflow_e overflow_y = css_computed_overflow_y(style); - int scrollbar_width_x = - (overflow_x == CSS_OVERFLOW_SCROLL || - overflow_x == CSS_OVERFLOW_AUTO) ? - SCROLLBAR_WIDTH : 0; - int scrollbar_width_y = - (overflow_y == CSS_OVERFLOW_SCROLL || - overflow_y == CSS_OVERFLOW_AUTO) ? - SCROLLBAR_WIDTH : 0; + if (split != split_box->length) { + if (!layout_text_box_split(content, &fstyle, + split_box, split, w)) + return false; + b = split_box->next; + } + x += space_before + w; - layout_find_dimensions(available_width, -1, box, style, &width, &height, - &max_width, &min_width, &max_height, &min_height, - margin, padding, border); + NSLOG(layout, DEBUG, "fitting words"); - if (margin[LEFT] == AUTO) - margin[LEFT] = 0; - if (margin[RIGHT] == AUTO) - margin[RIGHT] = 0; + } + move_y = true; + } - if (box->gadget == NULL) { - padding[RIGHT] += scrollbar_width_y; - padding[BOTTOM] += scrollbar_width_x; + /* set positions */ + switch (css_computed_text_align(first->parent->parent->style)) { + case CSS_TEXT_ALIGN_RIGHT: + case CSS_TEXT_ALIGN_LIBCSS_RIGHT: + x0 = x1 - x; + break; + case CSS_TEXT_ALIGN_CENTER: + case CSS_TEXT_ALIGN_LIBCSS_CENTER: + x0 = (x0 + (x1 - x)) / 2; + break; + case CSS_TEXT_ALIGN_LEFT: + case CSS_TEXT_ALIGN_LIBCSS_LEFT: + case CSS_TEXT_ALIGN_JUSTIFY: + /* leave on left */ + break; + case CSS_TEXT_ALIGN_DEFAULT: + /* None; consider text direction */ + switch (css_computed_direction(first->parent->parent->style)) { + case CSS_DIRECTION_LTR: + /* leave on left */ + break; + case CSS_DIRECTION_RTL: + x0 = x1 - x; + break; + } + break; } - if (box->object && !(box->flags & REPLACE_DIM) && - content_get_type(box->object) != CONTENT_HTML) { - /* Floating replaced element, with intrinsic width or height. - * See 10.3.6 and 10.6.2 */ - layout_get_object_dimensions(box, &width, &height, - min_width, max_width, min_height, max_height); - } else if (box->gadget && (box->gadget->type == GADGET_TEXTBOX || - box->gadget->type == GADGET_PASSWORD || - box->gadget->type == GADGET_FILE || - box->gadget->type == GADGET_TEXTAREA)) { - css_fixed size = 0; - css_unit unit = CSS_UNIT_EM; + for (d = first; d != b; d = d->next) { + d->flags &= ~NEW_LINE; - /* Give sensible dimensions to gadgets, with auto width/height, - * that don't shrink to fit contained text. */ - assert(box->style); + if (d->type == BOX_INLINE_BLOCK && + (css_computed_position(d->style) == + CSS_POSITION_ABSOLUTE || + css_computed_position(d->style) == + CSS_POSITION_FIXED)) { + /* positioned inline-blocks: + * set static position (x,y) only, rest of positioning + * is handled later */ + d->x += x0; + d->y = *y; + continue; + } else if ((d->type == BOX_INLINE && + ((d->object || d->gadget) == false) && + !(d->flags & IFRAME) && + !(d->flags & REPLACE_DIM)) || + d->type == BOX_BR || + d->type == BOX_TEXT || + d->type == BOX_INLINE_END) { + /* regular (non-replaced) inlines */ + d->x += x0; + d->y = *y - d->padding[TOP]; - if (box->gadget->type == GADGET_TEXTBOX || - box->gadget->type == GADGET_PASSWORD || - box->gadget->type == GADGET_FILE) { - if (width == AUTO) { - size = INTTOFIX(10); - width = FIXTOINT(nscss_len2px(size, unit, - box->style)); - } - if (box->gadget->type == GADGET_FILE && - height == AUTO) { - size = FLTTOFIX(1.5); - height = FIXTOINT(nscss_len2px(size, unit, - box->style)); - } - } - if (box->gadget->type == GADGET_TEXTAREA) { - if (width == AUTO) { - size = INTTOFIX(10); - width = FIXTOINT(nscss_len2px(size, unit, - box->style)); - } - if (height == AUTO) { - size = INTTOFIX(4); - height = FIXTOINT(nscss_len2px(size, unit, - box->style)); + if (d->type == BOX_TEXT && d->height > used_height) { + /* text */ + used_height = d->height; } + } else if ((d->type == BOX_INLINE) || + d->type == BOX_INLINE_BLOCK) { + /* replaced inlines and inline-blocks */ + d->x += x0; + d->y = *y + d->border[TOP].width + d->margin[TOP]; + h = d->margin[TOP] + d->border[TOP].width + + d->padding[TOP] + d->height + + d->padding[BOTTOM] + + d->border[BOTTOM].width + + d->margin[BOTTOM]; + if (used_height < h) + used_height = h; } - } else if (width == AUTO) { - /* CSS 2.1 section 10.3.5 */ - width = min(max(box->min_width, available_width), - box->max_width); + } - /* width includes margin, borders and padding */ - if (width == available_width) { - width -= box->margin[LEFT] + box->border[LEFT].width + - box->padding[LEFT] + - box->padding[RIGHT] + - box->border[RIGHT].width + - box->margin[RIGHT]; - } else { - /* width was obtained from a min_width or max_width - * value, so need to use the same method for calculating - * mbp as was used in layout_minmax_block() */ - int fixed = 0; - float frac = 0; - calculate_mbp_width(box->style, LEFT, true, true, true, - &fixed, &frac); - calculate_mbp_width(box->style, RIGHT, true, true, true, - &fixed, &frac); - if (fixed < 0) - fixed = 0; + first->flags |= NEW_LINE; - width -= fixed; + assert(b != first || (move_y && 0 < used_height && (left || right))); + + /* handle vertical-align by adjusting box y values */ + /** \todo proper vertical alignment handling */ + for (d = first; d != b; d = d->next) { + if ((d->type == BOX_INLINE && d->inline_end) || + d->type == BOX_BR || + d->type == BOX_TEXT || + d->type == BOX_INLINE_END) { + css_fixed value = 0; + css_unit unit = CSS_UNIT_PX; + switch (css_computed_vertical_align(d->style, &value, + &unit)) { + case CSS_VERTICAL_ALIGN_SUPER: + case CSS_VERTICAL_ALIGN_TOP: + case CSS_VERTICAL_ALIGN_TEXT_TOP: + /* already at top */ + break; + case CSS_VERTICAL_ALIGN_SUB: + case CSS_VERTICAL_ALIGN_BOTTOM: + case CSS_VERTICAL_ALIGN_TEXT_BOTTOM: + d->y += used_height - d->height; + break; + default: + case CSS_VERTICAL_ALIGN_BASELINE: + d->y += 0.75 * (used_height - d->height); + break; + } } - - if (max_width >= 0 && width > max_width) width = max_width; - if (min_width > 0 && width < min_width) width = min_width; - - } else { - if (max_width >= 0 && width > max_width) width = max_width; - if (min_width > 0 && width < min_width) width = min_width; - width -= scrollbar_width_y; } - box->width = width; - box->height = height; + /* handle clearance for br */ + if (br_box && css_computed_clear(br_box->style) != CSS_CLEAR_NONE) { + int clear_y = layout_clear(cont->float_children, + css_computed_clear(br_box->style)); + if (used_height < clear_y - cy) + used_height = clear_y - cy; + } - if (margin[TOP] == AUTO) - margin[TOP] = 0; - if (margin[BOTTOM] == AUTO) - margin[BOTTOM] = 0; + if (move_y) + *y += used_height; + *next_box = b; + *width = x; /* return actual width */ + return true; } /** - * Layout the contents of a float or inline block. + * Layout lines of text or inline boxes with floats. * - * \param b float or inline block box - * \param width available width - * \param content memory pool for any new boxes - * \return true on success, false on memory exhaustion + * \param box inline container box + * \param width horizontal space available + * \param cont ancestor box which defines horizontal space, for floats + * \param cx box position relative to cont + * \param cy box position relative to cont + * \param content memory pool for any new boxes + * \return true on success, false on memory exhaustion */ -static bool layout_float(struct box *b, int width, html_content *content) +static bool layout_inline_container(struct box *inline_container, int width, + struct box *cont, int cx, int cy, html_content *content) { - assert(b->type == BOX_TABLE || b->type == BOX_BLOCK || - b->type == BOX_INLINE_BLOCK); - layout_float_find_dimensions(width, b->style, b); - if (b->type == BOX_TABLE) { - if (!layout_table(b, width, content)) - return false; - if (b->margin[LEFT] == AUTO) - b->margin[LEFT] = 0; - if (b->margin[RIGHT] == AUTO) - b->margin[RIGHT] = 0; - if (b->margin[TOP] == AUTO) - b->margin[TOP] = 0; - if (b->margin[BOTTOM] == AUTO) - b->margin[BOTTOM] = 0; - } else - return layout_block_context(b, -1, content); - return true; -} + bool first_line = true; + bool has_text_children; + struct box *c, *next; + int y = 0; + int curwidth,maxwidth = width; + + assert(inline_container->type == BOX_INLINE_CONTAINER); + NSLOG(layout, DEBUG, + "inline_container %p, width %i, cont %p, cx %i, cy %i", + inline_container, + width, + cont, + cx, + cy); -/** - * Position a float in the first available space. - * - * \param c float box to position - * \param width available width - * \param cx x coordinate relative to cont to place float right of - * \param y y coordinate relative to cont to place float below - * \param cont ancestor box which defines horizontal space, for floats - */ -static void -place_float_below(struct box *c, int width, int cx, int y, struct box *cont) -{ - int x0, x1, yy; - struct box *left; - struct box *right; - yy = y > cont->cached_place_below_level ? - y : cont->cached_place_below_level; + has_text_children = false; + for (c = inline_container->children; c; c = c->next) { + bool is_pre = false; - NSLOG(layout, DEBUG, - "c %p, width %i, cx %i, y %i, cont %p", c, - width, cx, y, cont); + if (c->style) { + enum css_white_space_e whitespace; - do { - y = yy; - x0 = cx; - x1 = cx + width; - find_sides(cont->float_children, y, y + c->height, &x0, &x1, - &left, &right); - if (left != 0 && right != 0) { - yy = (left->y + left->height < - right->y + right->height ? - left->y + left->height : - right->y + right->height); - } else if (left == 0 && right != 0) { - yy = right->y + right->height; - } else if (left != 0 && right == 0) { - yy = left->y + left->height; + whitespace = css_computed_white_space(c->style); + + is_pre = (whitespace == CSS_WHITE_SPACE_PRE || + whitespace == CSS_WHITE_SPACE_PRE_LINE || + whitespace == CSS_WHITE_SPACE_PRE_WRAP); } - } while ((left != 0 || right != 0) && (c->width > x1 - x0)); - if (c->type == BOX_FLOAT_LEFT) { - c->x = x0; - } else { - c->x = x1 - c->width; + if ((!c->object && !(c->flags & REPLACE_DIM) && + !(c->flags & IFRAME) && + c->text && (c->length || is_pre)) || + c->type == BOX_BR) + has_text_children = true; } - c->y = y; - cont->cached_place_below_level = y; + + /** \todo fix wrapping so that a box with horizontal scrollbar will + * shrink back to 'width' if no word is wider than 'width' (Or just set + * curwidth = width and have the multiword lines wrap to the min width) + */ + for (c = inline_container->children; c; ) { + + NSLOG(layout, DEBUG, "c %p", c); + + curwidth = inline_container->width; + if (!layout_line(c, &curwidth, &y, cx, cy + y, cont, first_line, + has_text_children, content, &next)) + return false; + maxwidth = max(maxwidth,curwidth); + c = next; + first_line = false; + } + + inline_container->width = maxwidth; + inline_container->height = y; + + return true; } /** - * Position a line of boxes in inline formatting context. + * Layout a block formatting context. * - * \param first box at start of line - * \param width available width on input, updated with actual width on output - * (may be incorrect if the line gets split?) - * \param y coordinate of top of line, updated on exit to bottom - * \param cx coordinate of left of line relative to cont - * \param cy coordinate of top of line relative to cont - * \param cont ancestor box which defines horizontal space, for floats - * \param indent apply any first-line indent - * \param has_text_children at least one TEXT in the inline_container - * \param next_box updated to first box for next line, or 0 at end - * \param content memory pool for any new boxes + * \param block BLOCK, INLINE_BLOCK, or TABLE_CELL to layout + * \param viewport_height Height of viewport in pixels or -ve if unknown + * \param content Memory pool for any new boxes * \return true on success, false on memory exhaustion + * + * This function carries out layout of a block and its children, as described + * in CSS 2.1 9.4.1. */ static bool -layout_line(struct box *first, - int *width, - int *y, - int cx, - int cy, - struct box *cont, - bool indent, - bool has_text_children, - html_content *content, - struct box **next_box) +layout_block_context(struct box *block, + int viewport_height, + html_content *content) { - int height, used_height; - int x0 = 0; - int x1 = *width; - int x, h, x_previous; - int fy = cy; - struct box *left; - struct box *right; - struct box *b; - struct box *split_box = 0; - struct box *d; - struct box *br_box = 0; - bool move_y = false; - bool place_below = false; - int space_before = 0, space_after = 0; - unsigned int inline_count = 0; - unsigned int i; - const struct gui_layout_table *font_func = content->font_func; - plot_font_style_t fstyle; + struct box *box; + int cx, cy; /**< current coordinates */ + int max_pos_margin = 0; + int max_neg_margin = 0; + int y = 0; + int lm, rm; + struct box *margin_collapse = NULL; + bool in_margin = false; + css_fixed gadget_size; + css_unit gadget_unit; /* Checkbox / radio buttons */ - NSLOG(layout, DEBUG, - "first %p, first->text '%.*s', width %i, y %i, cx %i, cy %i", - first, - (int)first->length, - first->text, - *width, - *y, - cx, - cy); + assert(block->type == BOX_BLOCK || + block->type == BOX_INLINE_BLOCK || + block->type == BOX_TABLE_CELL); + assert(block->width != UNKNOWN_WIDTH); + assert(block->width != AUTO); - /* find sides at top of line */ - x0 += cx; - x1 += cx; - find_sides(cont->float_children, cy, cy, &x0, &x1, &left, &right); - x0 -= cx; - x1 -= cx; + block->float_children = NULL; + block->cached_place_below_level = 0; + block->clear_level = 0; + + /* special case if the block contains an object */ + if (block->object) { + int temp_width = block->width; + if (!layout_block_object(block)) + return false; + layout_get_object_dimensions(block, &temp_width, + &block->height, INT_MIN, INT_MAX, + INT_MIN, INT_MAX); + return true; + } else if (block->flags & REPLACE_DIM) { + return true; + } + + /* special case if the block contains an radio button or checkbox */ + if (block->gadget && (block->gadget->type == GADGET_RADIO || + block->gadget->type == GADGET_CHECKBOX)) { + /* form checkbox or radio button + * if width or height is AUTO, set it to 1em */ + gadget_unit = CSS_UNIT_EM; + gadget_size = INTTOFIX(1); + if (block->height == AUTO) + block->height = FIXTOINT(nscss_len2px( + &content->len_ctx, gadget_size, + gadget_unit, block->style)); + } - if (indent) - x0 += layout_text_indent(first->parent->parent->style, *width); + box = block->children; + /* set current coordinates to top-left of the block */ + cx = 0; + y = cy = block->padding[TOP]; + if (box) + box->y = block->padding[TOP]; - if (x1 < x0) - x1 = x0; + /* Step through the descendants of the block in depth-first order, but + * not into the children of boxes which aren't blocks. For example, if + * the tree passed to this function looks like this (box->type shown): + * + * block -> BOX_BLOCK + * BOX_BLOCK * (1) + * BOX_INLINE_CONTAINER * (2) + * BOX_INLINE + * BOX_TEXT + * ... + * BOX_BLOCK * (3) + * BOX_TABLE * (4) + * BOX_TABLE_ROW + * BOX_TABLE_CELL + * ... + * BOX_TABLE_CELL + * ... + * BOX_BLOCK * (5) + * BOX_INLINE_CONTAINER * (6) + * BOX_TEXT + * ... + * then the while loop will visit each box marked with *, setting box + * to each in the order shown. */ + while (box) { + enum css_overflow_e overflow_x = CSS_OVERFLOW_VISIBLE; + enum css_overflow_e overflow_y = CSS_OVERFLOW_VISIBLE; - /* get minimum line height from containing block. - * this is the line-height if there are text children and also in the - * case of an initially empty text input */ - if (has_text_children || first->parent->parent->gadget) - used_height = height = - line_height(first->parent->parent->style); - else - /* inline containers with no text are usually for layout and - * look better with no minimum line-height */ - used_height = height = 0; + assert(box->type == BOX_BLOCK || box->type == BOX_TABLE || + box->type == BOX_INLINE_CONTAINER); - /* pass 1: find height of line assuming sides at top of line: loop - * body executed at least once - * keep in sync with the loop in layout_minmax_line() */ + /* Tables are laid out before being positioned, because the + * position depends on the width which is calculated in + * table layout. Blocks and inline containers are positioned + * before being laid out, because width is not dependent on + * content, and the position is required during layout for + * correct handling of floats. + */ - NSLOG(layout, DEBUG, "x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0); + if (box->style && + (css_computed_position(box->style) == + CSS_POSITION_ABSOLUTE || + css_computed_position(box->style) == + CSS_POSITION_FIXED)) { + box->x = box->parent->padding[LEFT]; + /* absolute positioned; this element will establish + * its own block context when it gets laid out later, + * so no need to look at its children now. */ + goto advance_to_next_box; + } + /* If we don't know which box the current margin collapses + * through to, find out. Update the pos/neg margin values. */ + if (margin_collapse == NULL) { + margin_collapse = layout_next_margin_block( + &content->len_ctx, box, block, + viewport_height, + &max_pos_margin, &max_neg_margin); + /* We have a margin that has not yet been applied. */ + in_margin = true; + } - for (x = 0, b = first; x <= x1 - x0 && b != 0; b = b->next) { - int min_width, max_width, min_height, max_height; + /* Clearance. */ + y = 0; + if (box->style && css_computed_clear(box->style) != + CSS_CLEAR_NONE) + y = layout_clear(block->float_children, + css_computed_clear(box->style)); - assert(b->type == BOX_INLINE || b->type == BOX_INLINE_BLOCK || - b->type == BOX_FLOAT_LEFT || - b->type == BOX_FLOAT_RIGHT || - b->type == BOX_BR || b->type == BOX_TEXT || - b->type == BOX_INLINE_END); + /* Find box's overflow properties */ + if (box->style) { + overflow_x = css_computed_overflow_x(box->style); + overflow_y = css_computed_overflow_y(box->style); + } + /* Blocks establishing a block formatting context get minimum + * left and right margins to avoid any floats. */ + lm = rm = 0; - NSLOG(layout, DEBUG, "pass 1: b %p, x %i", b, x); + if (box->type == BOX_BLOCK || box->flags & IFRAME) { + if (!box->object && !(box->flags & IFRAME) && + !(box->flags & REPLACE_DIM) && + box->style && + (overflow_x != CSS_OVERFLOW_VISIBLE || + overflow_y != CSS_OVERFLOW_VISIBLE)) { + /* box establishes new block formatting context + * so available width may be diminished due to + * floats. */ + int x0, x1, top; + struct box *left, *right; + top = cy + max_pos_margin - max_neg_margin; + top = (top > y) ? top : y; + x0 = cx; + x1 = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT]; + find_sides(block->float_children, top, top, + &x0, &x1, &left, &right); + /* calculate min required left & right margins + * needed to avoid floats */ + lm = x0 - cx; + rm = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT] - + x1; + } + layout_block_find_dimensions(&content->len_ctx, + box->parent->width, + viewport_height, lm, rm, box); + if (box->type == BOX_BLOCK && !(box->flags & IFRAME)) { + layout_block_add_scrollbar(box, RIGHT); + layout_block_add_scrollbar(box, BOTTOM); + } + } else if (box->type == BOX_TABLE) { + if (box->style != NULL) { + enum css_width_e wtype; + css_fixed width = 0; + css_unit unit = CSS_UNIT_PX; + wtype = css_computed_width(box->style, &width, + &unit); - if (b->type == BOX_BR) - break; + if (wtype == CSS_WIDTH_AUTO) { + /* max available width may be + * diminished due to floats. */ + int x0, x1, top; + struct box *left, *right; + top = cy + max_pos_margin - + max_neg_margin; + top = (top > y) ? top : y; + x0 = cx; + x1 = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT]; + find_sides(block->float_children, + top, top, &x0, &x1, + &left, &right); + /* calculate min required left & right + * margins needed to avoid floats */ + lm = x0 - cx; + rm = cx + box->parent->width - + box->parent->padding[LEFT] - + box->parent->padding[RIGHT] - + x1; + } + } + if (!layout_table(box, box->parent->width - lm - rm, + content)) + return false; + layout_solve_width(box, box->parent->width, box->width, + lm, rm, -1, -1); + } - if (b->type == BOX_FLOAT_LEFT || b->type == BOX_FLOAT_RIGHT) - continue; - if (b->type == BOX_INLINE_BLOCK && - (css_computed_position(b->style) == - CSS_POSITION_ABSOLUTE || - css_computed_position(b->style) == - CSS_POSITION_FIXED)) - continue; + /* Position box: horizontal. */ + box->x = box->parent->padding[LEFT] + box->margin[LEFT] + + box->border[LEFT].width; + cx += box->x; - assert(b->style != NULL); - font_plot_style_from_css(b->style, &fstyle); + /* Position box: vertical. */ + if (box->border[TOP].width) { + box->y += box->border[TOP].width; + cy += box->border[TOP].width; + } - x += space_after; + /* Vertical margin */ + if (((box->type == BOX_BLOCK && + (box->flags & HAS_HEIGHT)) || + box->type == BOX_TABLE || + (box->type == BOX_INLINE_CONTAINER && + box != box->parent->children) || + margin_collapse == box) && + in_margin == true) { + /* Margin goes above this box. */ + cy += max_pos_margin - max_neg_margin; + box->y += max_pos_margin - max_neg_margin; - if (b->type == BOX_INLINE_BLOCK) { - if (b->max_width != UNKNOWN_WIDTH) - if (!layout_float(b, *width, content)) - return false; - h = b->border[TOP].width + b->padding[TOP] + b->height + - b->padding[BOTTOM] + - b->border[BOTTOM].width; - if (height < h) - height = h; - x += b->margin[LEFT] + b->border[LEFT].width + - b->padding[LEFT] + b->width + - b->padding[RIGHT] + - b->border[RIGHT].width + - b->margin[RIGHT]; - space_after = 0; - continue; + /* Current margin has been applied. */ + in_margin = false; + max_pos_margin = max_neg_margin = 0; } - if (b->type == BOX_INLINE) { - /* calculate borders, margins, and padding */ - layout_find_dimensions(*width, -1, b, b->style, 0, 0, - 0, 0, 0, 0, b->margin, b->padding, - b->border); - for (i = 0; i != 4; i++) - if (b->margin[i] == AUTO) - b->margin[i] = 0; - x += b->margin[LEFT] + b->border[LEFT].width + - b->padding[LEFT]; - if (b->inline_end) { - b->inline_end->margin[RIGHT] = b->margin[RIGHT]; - b->inline_end->padding[RIGHT] = - b->padding[RIGHT]; - b->inline_end->border[RIGHT] = - b->border[RIGHT]; - } else { - x += b->padding[RIGHT] + - b->border[RIGHT].width + - b->margin[RIGHT]; - } - } else if (b->type == BOX_INLINE_END) { - b->width = 0; - if (b->space == UNKNOWN_WIDTH) { - font_func->width(&fstyle, " ", 1, &b->space); - /** \todo handle errors */ + /* Handle clearance */ + if (box->type != BOX_INLINE_CONTAINER && + (y > 0) && (cy < y)) { + /* box clears something*/ + box->y += y - cy; + cy = y; + } + + /* Unless the box has an overflow style of visible, the box + * establishes a new block context. */ + if (box->type == BOX_BLOCK && box->style && + (overflow_x != CSS_OVERFLOW_VISIBLE || + overflow_y != CSS_OVERFLOW_VISIBLE)) { + + layout_block_context(box, viewport_height, content); + + cy += box->padding[TOP]; + + if (box->height == AUTO) { + box->height = 0; + layout_block_add_scrollbar(box, BOTTOM); } - space_after = b->space; - x += b->padding[RIGHT] + b->border[RIGHT].width + - b->margin[RIGHT]; - continue; + cx -= box->x; + cy += box->height + box->padding[BOTTOM] + + box->border[BOTTOM].width; + y = box->y + box->padding[TOP] + box->height + + box->padding[BOTTOM] + + box->border[BOTTOM].width; + + /* Skip children, because they are done in the new + * block context */ + goto advance_to_next_box; } - if (!b->object && !(b->flags & IFRAME) && !b->gadget && - !(b->flags & REPLACE_DIM)) { - /* inline non-replaced, 10.3.1 and 10.6.1 */ - b->height = line_height(b->style ? b->style : - b->parent->parent->style); - if (height < b->height) - height = b->height; + NSLOG(layout, DEBUG, "box %p, cx %i, cy %i", box, cx, cy); - if (!b->text) { - b->width = 0; - space_after = 0; - continue; - } + /* Layout (except tables). */ + if (box->object) { + if (!layout_block_object(box)) + return false; - if (b->width == UNKNOWN_WIDTH) { - /** \todo handle errors */ + } else if (box->type == BOX_INLINE_CONTAINER) { + box->width = box->parent->width; + if (!layout_inline_container(box, box->width, block, + cx, cy, content)) + return false; - /* If it's a select element, we must use the - * width of the widest option text */ - if (b->parent->parent->gadget && - b->parent->parent->gadget->type - == GADGET_SELECT) { - int opt_maxwidth = 0; - struct form_option *o; + } else if (box->type == BOX_TABLE) { + /* Move down to avoid floats if necessary. */ + int x0, x1; + struct box *left, *right; + y = cy; + while (1) { + enum css_width_e wtype; + css_fixed width = 0; + css_unit unit = CSS_UNIT_PX; - for (o = b->parent->parent->gadget-> - data.select.items; o; - o = o->next) { - int opt_width; - font_func->width(&fstyle, - o->text, - strlen(o->text), - &opt_width); + wtype = css_computed_width(box->style, + &width, &unit); - if (opt_maxwidth < opt_width) - opt_maxwidth =opt_width; - } - b->width = opt_maxwidth; - if (nsoption_bool(core_select_menu)) - b->width += SCROLLBAR_WIDTH; - } else { - font_func->width(&fstyle, b->text, - b->length, &b->width); - b->flags |= MEASURED; - } + x0 = cx; + x1 = cx + box->parent->width; + find_sides(block->float_children, y, + y + box->height, + &x0, &x1, &left, &right); + if (wtype == CSS_WIDTH_AUTO) + break; + if (box->width <= x1 - x0) + break; + if (!left && !right) + break; + else if (!left) + y = right->y + right->height + 1; + else if (!right) + y = left->y + left->height + 1; + else if (left->y + left->height < + right->y + right->height) + y = left->y + left->height + 1; + else + y = right->y + right->height + 1; } + box->x += x0 - cx; + cx = x0; + box->y += y - cy; + cy = y; + } - /* If the current text has not been measured (i.e. its - * width was estimated after splitting), and it fits on - * the line, measure it properly, so next box is placed - * correctly. */ - if (b->text && (x + b->width < x1 - x0) && - !(b->flags & MEASURED) && - b->next) { - font_func->width(&fstyle, b->text, - b->length, &b->width); - b->flags |= MEASURED; - } + /* Advance to next box. */ + if (box->type == BOX_BLOCK && !box->object && !(box->iframe) && + box->children) { + /* Down into children. */ - x += b->width; - if (b->space == UNKNOWN_WIDTH) { - font_func->width(&fstyle, " ", 1, &b->space); - /** \todo handle errors */ + if (box == margin_collapse) { + /* Current margin collapsed though to this box. + * Unset margin_collapse. */ + margin_collapse = NULL; } - space_after = b->space; + + y = box->padding[TOP]; + box = box->children; + box->y = y; + cy += y; continue; + } else if (box->type == BOX_BLOCK || box->object || + box->flags & IFRAME) + cy += box->padding[TOP]; + + if (box->type == BOX_BLOCK && box->height == AUTO) { + box->height = 0; + layout_block_add_scrollbar(box, BOTTOM); } - space_after = 0; + cy += box->height + box->padding[BOTTOM] + + box->border[BOTTOM].width; + cx -= box->x; + y = box->y + box->padding[TOP] + box->height + + box->padding[BOTTOM] + + box->border[BOTTOM].width; - /* inline replaced, 10.3.2 and 10.6.2 */ - assert(b->style); + advance_to_next_box: + if (!box->next) { + /* No more siblings: + * up to first ancestor with a sibling. */ - layout_find_dimensions(*width, -1, b, b->style, - &b->width, &b->height, &max_width, &min_width, - &max_height, &min_height, NULL, NULL, NULL); + do { + if (box == margin_collapse) { + /* Current margin collapsed though to + * this box. Unset margin_collapse. */ + margin_collapse = NULL; + } - if (b->object && !(b->flags & REPLACE_DIM)) { - layout_get_object_dimensions(b, &b->width, &b->height, - min_width, max_width, - min_height, max_height); - } else if (b->flags & IFRAME) { - /* TODO: should we look at the content dimensions? */ - if (b->width == AUTO) - b->width = 400; - if (b->height == AUTO) - b->height = 300; + /* Apply bottom margin */ + if (max_pos_margin < box->margin[BOTTOM]) + max_pos_margin = box->margin[BOTTOM]; + else if (max_neg_margin < -box->margin[BOTTOM]) + max_neg_margin = -box->margin[BOTTOM]; - /* We reformat the iframe browser window to new - * dimensions in pass 2 */ - } else { - /* form control with no object */ - if (b->width == AUTO) - b->width = FIXTOINT(nscss_len2px(INTTOFIX(1), - CSS_UNIT_EM, b->style)); - if (b->height == AUTO) - b->height = FIXTOINT(nscss_len2px(INTTOFIX(1), - CSS_UNIT_EM, b->style)); - } + box = box->parent; + if (box == block) + break; - /* Reformat object to new box size */ - if (b->object && content_get_type(b->object) == CONTENT_HTML && - b->width != - content_get_available_width(b->object)) { - css_fixed value = 0; - css_unit unit = CSS_UNIT_PX; - enum css_height_e htype = css_computed_height(b->style, - &value, &unit); + /* Margin is invalidated if this is a box + * margins can't collapse through. */ + if (box->type == BOX_BLOCK && + box->flags & MAKE_HEIGHT) { + margin_collapse = NULL; + in_margin = false; + max_pos_margin = max_neg_margin = 0; + } - content_reformat(b->object, false, b->width, b->height); + if (box->height == AUTO) { + box->height = y - box->padding[TOP]; - if (htype == CSS_HEIGHT_AUTO) - b->height = content_get_height(b->object); - } + if (box->type == BOX_BLOCK) + layout_block_add_scrollbar(box, + BOTTOM); + } else + cy += box->height - + (y - box->padding[TOP]); - if (height < b->height) - height = b->height; + /* Apply any min-height and max-height to + * boxes in normal flow */ + if (box->style && + css_computed_position(box->style) != + CSS_POSITION_ABSOLUTE && + layout_apply_minmax_height( + &content->len_ctx, + box, NULL)) { + /* Height altered */ + /* Set current cy */ + cy += box->height - + (y - box->padding[TOP]); + } - x += b->width; - } + cy += box->padding[BOTTOM] + + box->border[BOTTOM].width; + cx -= box->x; + y = box->y + box->padding[TOP] + box->height + + box->padding[BOTTOM] + + box->border[BOTTOM].width; - /* find new sides using this height */ - x0 = cx; - x1 = cx + *width; - find_sides(cont->float_children, cy, cy + height, &x0, &x1, - &left, &right); - x0 -= cx; - x1 -= cx; + } while (box->next == NULL); + if (box == block) + break; + } - if (indent) - x0 += layout_text_indent(first->parent->parent->style, *width); + /* To next sibling. */ - if (x1 < x0) - x1 = x0; + if (box == margin_collapse) { + /* Current margin collapsed though to this box. + * Unset margin_collapse. */ + margin_collapse = NULL; + } - space_after = space_before = 0; + if (max_pos_margin < box->margin[BOTTOM]) + max_pos_margin = box->margin[BOTTOM]; + else if (max_neg_margin < -box->margin[BOTTOM]) + max_neg_margin = -box->margin[BOTTOM]; - /* pass 2: place boxes in line: loop body executed at least once */ + box = box->next; + box->y = y; + } - NSLOG(layout, DEBUG, "x0 %i, x1 %i, x1 - x0 %i", x0, x1, x1 - x0); + /* Account for bottom margin of last contained block */ + cy += max_pos_margin - max_neg_margin; - for (x = x_previous = 0, b = first; x <= x1 - x0 && b; b = b->next) { + /* Increase height to contain any floats inside (CSS 2.1 10.6.7). */ + for (box = block->float_children; box; box = box->next_float) { + y = box->y + box->height + box->padding[BOTTOM] + + box->border[BOTTOM].width + box->margin[BOTTOM]; + if (cy < y) + cy = y; + } - NSLOG(layout, DEBUG, "pass 2: b %p, x %i", b, x); + if (block->height == AUTO) { + block->height = cy - block->padding[TOP]; + if (block->type == BOX_BLOCK) + layout_block_add_scrollbar(block, BOTTOM); + } - if (b->type == BOX_INLINE_BLOCK && - (css_computed_position(b->style) == - CSS_POSITION_ABSOLUTE || - css_computed_position(b->style) == - CSS_POSITION_FIXED)) { - b->x = x + space_after; + if (block->style && css_computed_position(block->style) != + CSS_POSITION_ABSOLUTE) { + /* Block is in normal flow */ + layout_apply_minmax_height(&content->len_ctx, block, NULL); + } - } else if (b->type == BOX_INLINE || - b->type == BOX_INLINE_BLOCK || - b->type == BOX_TEXT || - b->type == BOX_INLINE_END) { - assert(b->width != UNKNOWN_WIDTH); + if (block->gadget && + (block->gadget->type == GADGET_TEXTAREA || + block->gadget->type == GADGET_PASSWORD || + block->gadget->type == GADGET_TEXTBOX)) { + plot_font_style_t fstyle; + int ta_width = block->padding[LEFT] + block->width + + block->padding[RIGHT]; + int ta_height = block->padding[TOP] + block->height + + block->padding[BOTTOM]; + font_plot_style_from_css(&content->len_ctx, + block->style, &fstyle); + fstyle.background = NS_TRANSPARENT; + textarea_set_layout(block->gadget->data.text.ta, + &fstyle, ta_width, ta_height, + block->padding[TOP], block->padding[RIGHT], + block->padding[BOTTOM], block->padding[LEFT]); + } - x_previous = x; - x += space_after; - b->x = x; + return true; +} - if ((b->type == BOX_INLINE && !b->inline_end) || - b->type == BOX_INLINE_BLOCK) { - b->x += b->margin[LEFT] + b->border[LEFT].width; - x = b->x + b->padding[LEFT] + b->width + - b->padding[RIGHT] + - b->border[RIGHT].width + - b->margin[RIGHT]; - } else if (b->type == BOX_INLINE) { - b->x += b->margin[LEFT] + b->border[LEFT].width; - x = b->x + b->padding[LEFT] + b->width; - } else if (b->type == BOX_INLINE_END) { - b->height = b->inline_end->height; - x += b->padding[RIGHT] + - b->border[RIGHT].width + - b->margin[RIGHT]; - } else { - x += b->width; - } - space_before = space_after; - if (b->object || b->flags & REPLACE_DIM || - b->flags & IFRAME) - space_after = 0; - else if (b->text || b->type == BOX_INLINE_END) { - if (b->space == UNKNOWN_WIDTH) { - font_plot_style_from_css(b->style, - &fstyle); - /** \todo handle errors */ - font_func->width(&fstyle, " ", 1, - &b->space); +/** + * Layout list markers. + */ +static void +layout_lists(struct box *box, + const struct gui_layout_table *font_func, + const nscss_len_ctx *len_ctx) +{ + struct box *child; + struct box *marker; + plot_font_style_t fstyle; + + for (child = box->children; child; child = child->next) { + if (child->list_marker) { + marker = child->list_marker; + if (marker->object) { + marker->width = + content_get_width(marker->object); + marker->x = -marker->width; + marker->height = + content_get_height(marker->object); + marker->y = (line_height(len_ctx, + marker->style) - + marker->height) / 2; + } else if (marker->text) { + if (marker->width == UNKNOWN_WIDTH) { + font_plot_style_from_css(len_ctx, + marker->style, &fstyle); + font_func->width(&fstyle, + marker->text, + marker->length, + &marker->width); + marker->flags |= MEASURED; } - space_after = b->space; + marker->x = -marker->width; + marker->y = 0; + marker->height = line_height(len_ctx, + marker->style); } else { - space_after = 0; + marker->x = 0; + marker->y = 0; + marker->width = 0; + marker->height = 0; } - split_box = b; - move_y = true; - inline_count++; - } else if (b->type == BOX_BR) { - b->x = x; - b->width = 0; - br_box = b; - b = b->next; - split_box = 0; - move_y = true; - break; - - } else { - /* float */ - NSLOG(layout, DEBUG, "float %p", b); - - d = b->children; - d->float_children = 0; - d->cached_place_below_level = 0; - b->float_container = d->float_container = cont; - - if (!layout_float(d, *width, content)) - return false; + /* Gap between marker and content */ + marker->x -= 4; + } + layout_lists(child, font_func, len_ctx); + } +} - NSLOG(layout, DEBUG, - "%p : %d %d", - d, - d->margin[TOP], - d->border[TOP].width); - d->x = d->margin[LEFT] + d->border[LEFT].width; - d->y = d->margin[TOP] + d->border[TOP].width; - b->width = d->margin[LEFT] + d->border[LEFT].width + - d->padding[LEFT] + d->width + - d->padding[RIGHT] + - d->border[RIGHT].width + - d->margin[RIGHT]; - b->height = d->margin[TOP] + d->border[TOP].width + - d->padding[TOP] + d->height + - d->padding[BOTTOM] + - d->border[BOTTOM].width + - d->margin[BOTTOM]; +/** + * Compute box offsets for a relatively or absolutely positioned box with + * respect to a box. + * + * \param len_ctx Length conversion context + * \param box box to compute offsets for + * \param containing_block box to compute percentages with respect to + * \param top updated to top offset, or AUTO + * \param right updated to right offset, or AUTO + * \param bottom updated to bottom offset, or AUTO + * \param left updated to left offset, or AUTO + * + * See CSS 2.1 9.3.2. containing_block must have width and height. + */ +static void +layout_compute_offsets(const nscss_len_ctx *len_ctx, + struct box *box, + struct box *containing_block, + int *top, + int *right, + int *bottom, + int *left) +{ + uint32_t type; + css_fixed value = 0; + css_unit unit = CSS_UNIT_PX; - if (b->width > (x1 - x0) - x) - place_below = true; - if (d->style && (css_computed_clear(d->style) == - CSS_CLEAR_NONE || - (css_computed_clear(d->style) == - CSS_CLEAR_LEFT && left == 0) || - (css_computed_clear(d->style) == - CSS_CLEAR_RIGHT && - right == 0) || - (css_computed_clear(d->style) == - CSS_CLEAR_BOTH && - left == 0 && right == 0)) && - (!place_below || - (left == 0 && right == 0 && x == 0)) && - cy >= cont->clear_level && - cy >= cont->cached_place_below_level) { - /* + not cleared or, - * cleared and there are no floats to clear - * + fits without needing to be placed below or, - * this line is empty with no floats - * + current y, cy, is below the clear level - * - * Float affects current line */ - if (b->type == BOX_FLOAT_LEFT) { - b->x = cx + x0; - if (b->width > 0) - x0 += b->width; - left = b; - } else { - b->x = cx + x1 - b->width; - if (b->width > 0) - x1 -= b->width; - right = b; - } - b->y = cy; - } else { - /* cleared or doesn't fit on line */ - /* place below into next available space */ - int fcy = (cy > cont->clear_level) ? cy : - cont->clear_level; - fcy = (fcy > cont->cached_place_below_level) ? - fcy : - cont->cached_place_below_level; - fy = (fy > fcy) ? fy : fcy; - fy = (fy == cy) ? fy + height : fy; + assert(containing_block->width != UNKNOWN_WIDTH && + containing_block->width != AUTO && + containing_block->height != AUTO); - place_float_below(b, *width, cx, fy, cont); - fy = b->y; - if (d->style && ( - (css_computed_clear(d->style) == - CSS_CLEAR_LEFT && left != 0) || - (css_computed_clear(d->style) == - CSS_CLEAR_RIGHT && - right != 0) || - (css_computed_clear(d->style) == - CSS_CLEAR_BOTH && - (left != 0 || right != 0)))) { - /* to be cleared below existing - * floats */ - if (b->type == BOX_FLOAT_LEFT) - b->x = cx; - else - b->x = cx + *width - b->width; + /* left */ + type = css_computed_left(box->style, &value, &unit); + if (type == CSS_LEFT_SET) { + if (unit == CSS_UNIT_PCT) { + *left = FPCT_OF_INT_TOINT(value, + containing_block->width); + } else { + *left = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); + } + } else { + *left = AUTO; + } - fcy = layout_clear(cont->float_children, - css_computed_clear(d->style)); - if (fcy > cont->clear_level) - cont->clear_level = fcy; - if (b->y < fcy) - b->y = fcy; - } - if (b->type == BOX_FLOAT_LEFT) - left = b; - else - right = b; - } - add_float_to_container(cont, b); + /* right */ + type = css_computed_right(box->style, &value, &unit); + if (type == CSS_RIGHT_SET) { + if (unit == CSS_UNIT_PCT) { + *right = FPCT_OF_INT_TOINT(value, + containing_block->width); + } else { + *right = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); + } + } else { + *right = AUTO; + } - split_box = 0; + /* top */ + type = css_computed_top(box->style, &value, &unit); + if (type == CSS_TOP_SET) { + if (unit == CSS_UNIT_PCT) { + *top = FPCT_OF_INT_TOINT(value, + containing_block->height); + } else { + *top = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); } + } else { + *top = AUTO; } - if (x1 - x0 < x && split_box) { - /* the last box went over the end */ - size_t split = 0; - int w; - bool no_wrap = css_computed_white_space( - split_box->style) == CSS_WHITE_SPACE_NOWRAP || - css_computed_white_space( - split_box->style) == CSS_WHITE_SPACE_PRE; + /* bottom */ + type = css_computed_bottom(box->style, &value, &unit); + if (type == CSS_BOTTOM_SET) { + if (unit == CSS_UNIT_PCT) { + *bottom = FPCT_OF_INT_TOINT(value, + containing_block->height); + } else { + *bottom = FIXTOINT(nscss_len2px(len_ctx, + value, unit, box->style)); + } + } else { + *bottom = AUTO; + } +} - x = x_previous; - if (!no_wrap && - (split_box->type == BOX_INLINE || - split_box->type == BOX_TEXT) && - !split_box->object && - !(split_box->flags & REPLACE_DIM) && - !(split_box->flags & IFRAME) && - !split_box->gadget && split_box->text) { +/** + * Layout and position an absolutely positioned box. + * + * \param box absolute box to layout and position + * \param containing_block containing block + * \param cx position of box relative to containing_block + * \param cy position of box relative to containing_block + * \param content memory pool for any new boxes + * \return true on success, false on memory exhaustion + */ +static bool +layout_absolute(struct box *box, + struct box *containing_block, + int cx, int cy, + html_content *content) +{ + int static_left, static_top; /* static position */ + int top, right, bottom, left; + int width, height, max_width, min_width; + int *margin = box->margin; + int *padding = box->padding; + struct box_border *border = box->border; + int available_width = containing_block->width; + int space; - font_plot_style_from_css(split_box->style, &fstyle); - /** \todo handle errors */ - font_func->split(&fstyle, - split_box->text, - split_box->length, - x1 - x0 - x - space_before, - &split, - &w); - } + assert(box->type == BOX_BLOCK || box->type == BOX_TABLE || + box->type == BOX_INLINE_BLOCK); - /* split == 0 implies that text can't be split */ + /* The static position is where the box would be if it was not + * absolutely positioned. The x and y are filled in by + * layout_block_context(). */ + static_left = cx + box->x; + static_top = cy + box->y; - if (split == 0) - w = split_box->width; + if (containing_block->type == BOX_BLOCK || + containing_block->type == BOX_INLINE_BLOCK || + containing_block->type == BOX_TABLE_CELL) { + /* Block level container => temporarily increase containing + * block dimensions to include padding (we restore this + * again at the end) */ + containing_block->width += containing_block->padding[LEFT] + + containing_block->padding[RIGHT]; + containing_block->height += containing_block->padding[TOP] + + containing_block->padding[BOTTOM]; + } else { + /** \todo inline containers */ + } + layout_compute_offsets(&content->len_ctx, box, containing_block, + &top, &right, &bottom, &left); - NSLOG(layout, DEBUG, - "splitting: split_box %p \"%.*s\", spilt %zu, w %i, " - "left %p, right %p, inline_count %u", - split_box, - (int)split_box->length, - split_box->text, - split, - w, - left, - right, - inline_count); + /* Pass containing block into layout_find_dimensions via the float + * containing block box member. This is unused for absolutely positioned + * boxes because a box can't be floated and absolutely positioned. */ + box->float_container = containing_block; + layout_find_dimensions(&content->len_ctx, available_width, -1, + box, box->style, &width, &height, + &max_width, &min_width, 0, 0, + margin, padding, border); + box->float_container = NULL; - if ((split == 0 || x1 - x0 <= x + space_before + w) && - !left && !right && inline_count == 1) { - /* first word of box doesn't fit, but no floats and - * first box on line so force in */ - if (split == 0 || split == split_box->length) { - /* only one word in this box, or not text - * or white-space:nowrap */ - b = split_box->next; + /* 10.3.7 */ + NSLOG(layout, DEBUG, + "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", + left, margin[LEFT], border[LEFT].width, padding[LEFT], width, + padding[RIGHT], border[RIGHT].width, margin[RIGHT], right, + containing_block->width); + + + if (left == AUTO && width == AUTO && right == AUTO) { + if (margin[LEFT] == AUTO) + margin[LEFT] = 0; + if (margin[RIGHT] == AUTO) + margin[RIGHT] = 0; + left = static_left; + + width = min(max(box->min_width, available_width), + box->max_width); + width -= box->margin[LEFT] + box->border[LEFT].width + + box->padding[LEFT] + box->padding[RIGHT] + + box->border[RIGHT].width + box->margin[RIGHT]; + + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) width = max_width; + if (width < min_width) width = min_width; + + right = containing_block->width - + left - + margin[LEFT] - border[LEFT].width - padding[LEFT] - + width - + padding[RIGHT] - border[RIGHT].width - margin[RIGHT]; + } else if (left != AUTO && width != AUTO && right != AUTO) { + + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) width = max_width; + if (min_width > 0 && width < min_width) width = min_width; + + if (margin[LEFT] == AUTO && margin[RIGHT] == AUTO) { + space = containing_block->width - + left - border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - right; + if (space < 0) { + margin[LEFT] = 0; + margin[RIGHT] = space; } else { - /* cut off first word for this line */ - if (!layout_text_box_split(content, &fstyle, - split_box, split, w)) - return false; - b = split_box->next; + margin[LEFT] = margin[RIGHT] = space / 2; } - x += space_before + w; - - NSLOG(layout, DEBUG, "forcing"); + } else if (margin[LEFT] == AUTO) { + margin[LEFT] = containing_block->width - + left - border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT] - + right; + } else if (margin[RIGHT] == AUTO) { + margin[RIGHT] = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - right; + } else { + right = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT]; + } + } else { + if (margin[LEFT] == AUTO) + margin[LEFT] = 0; + if (margin[RIGHT] == AUTO) + margin[RIGHT] = 0; - } else if ((split == 0 || x1 - x0 <= x + space_before + w) && - inline_count == 1) { - /* first word of first box doesn't fit, but a float is - * taking some of the width so move below it */ - assert(left || right); - used_height = 0; - if (left) { + if (left == AUTO && width == AUTO && right != AUTO) { + available_width -= right; - NSLOG(layout, DEBUG, - "cy %i, left->y %i, left->height %i", - cy, - left->y, - left->height); + width = min(max(box->min_width, available_width), + box->max_width); + width -= box->margin[LEFT] + box->border[LEFT].width + + box->padding[LEFT] + box->padding[RIGHT] + + box->border[RIGHT].width + box->margin[RIGHT]; - used_height = left->y + left->height - cy + 1; + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (width < min_width) + width = min_width; - NSLOG(layout, DEBUG, "used_height %i", - used_height); + left = containing_block->width - + margin[LEFT] - border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT] - + right; + } else if (left == AUTO && width != AUTO && right == AUTO) { - } - if (right && used_height < - right->y + right->height - cy + 1) - used_height = right->y + right->height - cy + 1; + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (min_width > 0 && width < min_width) + width = min_width; - if (used_height < 0) - used_height = 0; + left = static_left; + right = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT]; + } else if (left != AUTO && width == AUTO && right == AUTO) { + available_width -= left; - b = split_box; + width = min(max(box->min_width, available_width), + box->max_width); + width -= box->margin[LEFT] + box->border[LEFT].width + + box->padding[LEFT] + box->padding[RIGHT] + + box->border[RIGHT].width + box->margin[RIGHT]; - NSLOG(layout, DEBUG, "moving below float"); + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (width < min_width) + width = min_width; - } else if (split == 0 || x1 - x0 <= x + space_before + w) { - /* first word of box doesn't fit so leave box for next - * line */ - b = split_box; + right = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT]; + } else if (left == AUTO && width != AUTO && right != AUTO) { - NSLOG(layout, DEBUG, "leaving for next line"); + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (width < min_width) + width = min_width; - } else { - /* fit as many words as possible */ - assert(split != 0); + left = containing_block->width - + margin[LEFT] - border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT] - + right; + } else if (left != AUTO && width == AUTO && right != AUTO) { + width = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT] - + right; - NSLOG(layout, DEBUG, "'%.*s' %i %zu %i", - (int)split_box->length, split_box->text, - x1 - x0, split, w); + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (width < min_width) + width = min_width; - if (split != split_box->length) { - if (!layout_text_box_split(content, &fstyle, - split_box, split, w)) - return false; - b = split_box->next; - } - x += space_before + w; + } else if (left != AUTO && width != AUTO && right == AUTO) { - NSLOG(layout, DEBUG, "fitting words"); + /* Adjust for {min|max}-width */ + if (max_width >= 0 && width > max_width) + width = max_width; + if (width < min_width) + width = min_width; + right = containing_block->width - + left - margin[LEFT] - + border[LEFT].width - + padding[LEFT] - width - padding[RIGHT] - + border[RIGHT].width - margin[RIGHT]; } - move_y = true; } - /* set positions */ - switch (css_computed_text_align(first->parent->parent->style)) { - case CSS_TEXT_ALIGN_RIGHT: - case CSS_TEXT_ALIGN_LIBCSS_RIGHT: - x0 = x1 - x; - break; - case CSS_TEXT_ALIGN_CENTER: - case CSS_TEXT_ALIGN_LIBCSS_CENTER: - x0 = (x0 + (x1 - x)) / 2; - break; - case CSS_TEXT_ALIGN_LEFT: - case CSS_TEXT_ALIGN_LIBCSS_LEFT: - case CSS_TEXT_ALIGN_JUSTIFY: - /* leave on left */ - break; - case CSS_TEXT_ALIGN_DEFAULT: - /* None; consider text direction */ - switch (css_computed_direction(first->parent->parent->style)) { - case CSS_DIRECTION_LTR: - /* leave on left */ - break; - case CSS_DIRECTION_RTL: - x0 = x1 - x; - break; - } - break; + NSLOG(layout, DEBUG, + "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", + left, margin[LEFT], border[LEFT].width, padding[LEFT], width, + padding[RIGHT], border[RIGHT].width, margin[RIGHT], right, + containing_block->width); + + box->x = left + margin[LEFT] + border[LEFT].width - cx; + if (containing_block->type == BOX_BLOCK || + containing_block->type == BOX_INLINE_BLOCK || + containing_block->type == BOX_TABLE_CELL) { + /* Block-level ancestor => reset container's width */ + containing_block->width -= containing_block->padding[LEFT] + + containing_block->padding[RIGHT]; + } else { + /** \todo inline ancestors */ } + box->width = width; + box->height = height; - for (d = first; d != b; d = d->next) { - d->flags &= ~NEW_LINE; + if (box->type == BOX_BLOCK || box->type == BOX_INLINE_BLOCK || + box->object || box->flags & IFRAME) { + if (!layout_block_context(box, -1, content)) + return false; + } else if (box->type == BOX_TABLE) { + /* layout_table also expects the containing block to be + * stored in the float_container field */ + box->float_container = containing_block; + /* \todo layout_table considers margins etc. again */ + if (!layout_table(box, width, content)) + return false; + box->float_container = NULL; + layout_solve_width(box, box->parent->width, box->width, 0, 0, + -1, -1); + } - if (d->type == BOX_INLINE_BLOCK && - (css_computed_position(d->style) == - CSS_POSITION_ABSOLUTE || - css_computed_position(d->style) == - CSS_POSITION_FIXED)) { - /* positioned inline-blocks: - * set static position (x,y) only, rest of positioning - * is handled later */ - d->x += x0; - d->y = *y; - continue; - } else if ((d->type == BOX_INLINE && - ((d->object || d->gadget) == false) && - !(d->flags & IFRAME) && - !(d->flags & REPLACE_DIM)) || - d->type == BOX_BR || - d->type == BOX_TEXT || - d->type == BOX_INLINE_END) { - /* regular (non-replaced) inlines */ - d->x += x0; - d->y = *y - d->padding[TOP]; + /* 10.6.4 */ + NSLOG(layout, DEBUG, + "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", + top, margin[TOP], border[TOP].width, padding[TOP], height, + padding[BOTTOM], border[BOTTOM].width, margin[BOTTOM], bottom, + containing_block->height); - if (d->type == BOX_TEXT && d->height > used_height) { - /* text */ - used_height = d->height; - } - } else if ((d->type == BOX_INLINE) || - d->type == BOX_INLINE_BLOCK) { - /* replaced inlines and inline-blocks */ - d->x += x0; - d->y = *y + d->border[TOP].width + d->margin[TOP]; - h = d->margin[TOP] + d->border[TOP].width + - d->padding[TOP] + d->height + - d->padding[BOTTOM] + - d->border[BOTTOM].width + - d->margin[BOTTOM]; - if (used_height < h) - used_height = h; + if (top == AUTO && height == AUTO && bottom == AUTO) { + top = static_top; + height = box->height; + if (margin[TOP] == AUTO) + margin[TOP] = 0; + if (margin[BOTTOM] == AUTO) + margin[BOTTOM] = 0; + bottom = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - padding[BOTTOM] - + border[BOTTOM].width - margin[BOTTOM]; + } else if (top != AUTO && height != AUTO && bottom != AUTO) { + if (margin[TOP] == AUTO && margin[BOTTOM] == AUTO) { + space = containing_block->height - + top - border[TOP].width - padding[TOP] - + height - padding[BOTTOM] - + border[BOTTOM].width - bottom; + margin[TOP] = margin[BOTTOM] = space / 2; + } else if (margin[TOP] == AUTO) { + margin[TOP] = containing_block->height - + top - border[TOP].width - padding[TOP] - + height - padding[BOTTOM] - + border[BOTTOM].width - margin[BOTTOM] - + bottom; + } else if (margin[BOTTOM] == AUTO) { + margin[BOTTOM] = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + bottom; + } else { + bottom = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM]; + } + } else { + if (margin[TOP] == AUTO) + margin[TOP] = 0; + if (margin[BOTTOM] == AUTO) + margin[BOTTOM] = 0; + if (top == AUTO && height == AUTO && bottom != AUTO) { + height = box->height; + top = containing_block->height - + margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM] - bottom; + } else if (top == AUTO && height != AUTO && bottom == AUTO) { + top = static_top; + bottom = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM]; + } else if (top != AUTO && height == AUTO && bottom == AUTO) { + height = box->height; + bottom = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM]; + } else if (top == AUTO && height != AUTO && bottom != AUTO) { + top = containing_block->height - + margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM] - bottom; + } else if (top != AUTO && height == AUTO && bottom != AUTO) { + height = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - padding[BOTTOM] - + border[BOTTOM].width - margin[BOTTOM] - + bottom; + } else if (top != AUTO && height != AUTO && bottom == AUTO) { + bottom = containing_block->height - + top - margin[TOP] - border[TOP].width - + padding[TOP] - height - + padding[BOTTOM] - border[BOTTOM].width - + margin[BOTTOM]; } } - first->flags |= NEW_LINE; - - assert(b != first || (move_y && 0 < used_height && (left || right))); - - /* handle vertical-align by adjusting box y values */ - /** \todo proper vertical alignment handling */ - for (d = first; d != b; d = d->next) { - if ((d->type == BOX_INLINE && d->inline_end) || - d->type == BOX_BR || - d->type == BOX_TEXT || - d->type == BOX_INLINE_END) { - css_fixed value = 0; - css_unit unit = CSS_UNIT_PX; - switch (css_computed_vertical_align(d->style, &value, - &unit)) { - case CSS_VERTICAL_ALIGN_SUPER: - case CSS_VERTICAL_ALIGN_TOP: - case CSS_VERTICAL_ALIGN_TEXT_TOP: - /* already at top */ - break; - case CSS_VERTICAL_ALIGN_SUB: - case CSS_VERTICAL_ALIGN_BOTTOM: - case CSS_VERTICAL_ALIGN_TEXT_BOTTOM: - d->y += used_height - d->height; - break; - default: - case CSS_VERTICAL_ALIGN_BASELINE: - d->y += 0.75 * (used_height - d->height); - break; - } - } - } + NSLOG(layout, DEBUG, + "%i + %i + %i + %i + %i + %i + %i + %i + %i = %i", + top, margin[TOP], border[TOP].width, padding[TOP], height, + padding[BOTTOM], border[BOTTOM].width, margin[BOTTOM], bottom, + containing_block->height); - /* handle clearance for br */ - if (br_box && css_computed_clear(br_box->style) != CSS_CLEAR_NONE) { - int clear_y = layout_clear(cont->float_children, - css_computed_clear(br_box->style)); - if (used_height < clear_y - cy) - used_height = clear_y - cy; + box->y = top + margin[TOP] + border[TOP].width - cy; + if (containing_block->type == BOX_BLOCK || + containing_block->type == BOX_INLINE_BLOCK || + containing_block->type == BOX_TABLE_CELL) { + /* Block-level ancestor => reset container's height */ + containing_block->height -= containing_block->padding[TOP] + + containing_block->padding[BOTTOM]; + } else { + /** \todo Inline ancestors */ } + box->height = height; + layout_apply_minmax_height(&content->len_ctx, box, containing_block); - if (move_y) - *y += used_height; - *next_box = b; - *width = x; /* return actual width */ return true; } -/* exported function documented in render/layout.h */ -bool layout_inline_container(struct box *inline_container, int width, - struct box *cont, int cx, int cy, html_content *content) +/** + * Recursively layout and position absolutely positioned boxes. + * + * \param box tree of boxes to layout + * \param containing_block current containing block + * \param cx position of box relative to containing_block + * \param cy position of box relative to containing_block + * \param content memory pool for any new boxes + * \return true on success, false on memory exhaustion + */ +static bool +layout_position_absolute(struct box *box, + struct box *containing_block, + int cx, int cy, + html_content *content) { - bool first_line = true; - bool has_text_children; - struct box *c, *next; - int y = 0; - int curwidth,maxwidth = width; - - assert(inline_container->type == BOX_INLINE_CONTAINER); - - NSLOG(layout, DEBUG, - "inline_container %p, width %i, cont %p, cx %i, cy %i", - inline_container, - width, - cont, - cx, - cy); - - - has_text_children = false; - for (c = inline_container->children; c; c = c->next) { - bool is_pre = false; - - if (c->style) { - enum css_white_space_e whitespace; - - whitespace = css_computed_white_space(c->style); + struct box *c; - is_pre = (whitespace == CSS_WHITE_SPACE_PRE || - whitespace == CSS_WHITE_SPACE_PRE_LINE || - whitespace == CSS_WHITE_SPACE_PRE_WRAP); + for (c = box->children; c; c = c->next) { + if ((c->type == BOX_BLOCK || c->type == BOX_TABLE || + c->type == BOX_INLINE_BLOCK) && + (css_computed_position(c->style) == + CSS_POSITION_ABSOLUTE || + css_computed_position(c->style) == + CSS_POSITION_FIXED)) { + if (!layout_absolute(c, containing_block, + cx, cy, content)) + return false; + if (!layout_position_absolute(c, c, 0, 0, content)) + return false; + } else if (c->style && css_computed_position(c->style) == + CSS_POSITION_RELATIVE) { + if (!layout_position_absolute(c, c, 0, 0, content)) + return false; + } else { + int px, py; + if (c->style && (css_computed_float(c->style) == + CSS_FLOAT_LEFT || + css_computed_float(c->style) == + CSS_FLOAT_RIGHT)) { + /* Float x/y coords are relative to nearest + * ansestor with float_children, rather than + * relative to parent. Need to get x/y relative + * to parent */ + struct box *p; + px = c->x; + py = c->y; + for (p = box->parent; p && !p->float_children; + p = p->parent) { + px -= p->x; + py -= p->y; + } + } else { + /* Not a float, so box x/y coords are relative + * to parent */ + px = c->x; + py = c->y; + } + if (!layout_position_absolute(c, containing_block, + cx + px, cy + py, content)) + return false; } - - if ((!c->object && !(c->flags & REPLACE_DIM) && - !(c->flags & IFRAME) && - c->text && (c->length || is_pre)) || - c->type == BOX_BR) - has_text_children = true; - } - - /** \todo fix wrapping so that a box with horizontal scrollbar will - * shrink back to 'width' if no word is wider than 'width' (Or just set - * curwidth = width and have the multiword lines wrap to the min width) - */ - for (c = inline_container->children; c; ) { - - NSLOG(layout, DEBUG, "c %p", c); - - curwidth = inline_container->width; - if (!layout_line(c, &curwidth, &y, cx, cy + y, cont, first_line, - has_text_children, content, &next)) - return false; - maxwidth = max(maxwidth,curwidth); - c = next; - first_line = false; } - inline_container->width = maxwidth; - inline_container->height = y; - return true; } -/* exported function documented in render/layout.h */ -void -layout_minmax_table(struct box *table, const struct gui_layout_table *font_func) +/** + * Compute a box's relative offset as per CSS 2.1 9.4.3 + * + * \param len_ctx Length conversion context + * \param box Box to compute relative offsets for. + * \param x Receives relative offset in x. + * \param y Receives relative offset in y. + */ +static void layout_compute_relative_offset( + const nscss_len_ctx *len_ctx, + struct box *box, + int *x, + int *y) { - unsigned int i, j; - int border_spacing_h = 0; - int table_min = 0, table_max = 0; - int extra_fixed = 0; - float extra_frac = 0; - struct column *col = table->col; - struct box *row_group, *row, *cell; - enum css_width_e wtype; - css_fixed value = 0; - css_unit unit = CSS_UNIT_PX; + int left, right, top, bottom; + struct box *containing_block; - /* check if the widths have already been calculated */ - if (table->max_width != UNKNOWN_MAX_WIDTH) - return; + assert(box && box->parent && box->style && + css_computed_position(box->style) == + CSS_POSITION_RELATIVE); - /* start with 0 except for fixed-width columns */ - for (i = 0; i != table->columns; i++) { - if (col[i].type == COLUMN_WIDTH_FIXED) - col[i].min = col[i].max = col[i].width; - else - col[i].min = col[i].max = 0; + if (box->float_container && + (css_computed_float(box->style) == CSS_FLOAT_LEFT || + css_computed_float(box->style) == CSS_FLOAT_RIGHT)) { + containing_block = box->float_container; + } else { + containing_block = box->parent; + } + + layout_compute_offsets(len_ctx, box, containing_block, + &top, &right, &bottom, &left); + + if (left == AUTO && right == AUTO) + left = right = 0; + else if (left == AUTO) + /* left is auto => computed = -right */ + left = -right; + else if (right == AUTO) + /* right is auto => computed = -left */ + right = -left; + else { + /* over constrained => examine direction property + * of containing block */ + if (containing_block->style && + css_computed_direction( + containing_block->style) == + CSS_DIRECTION_RTL) { + /* right wins */ + left = -right; + } else { + /* assume LTR in all other cases */ + right = -left; + } } - /* border-spacing is used in the separated borders model */ - if (css_computed_border_collapse(table->style) == - CSS_BORDER_COLLAPSE_SEPARATE) { - css_fixed h = 0, v = 0; - css_unit hu = CSS_UNIT_PX, vu = CSS_UNIT_PX; - - css_computed_border_spacing(table->style, &h, &hu, &v, &vu); + assert(left == -right); - border_spacing_h = FIXTOINT(nscss_len2px(h, hu, table->style)); + if (top == AUTO && bottom == AUTO) { + top = bottom = 0; + } else if (top == AUTO) { + top = -bottom; + } else { + /* bottom is AUTO, or neither are AUTO */ + bottom = -top; } - /* 1st pass: consider cells with colspan 1 only */ - for (row_group = table->children; row_group; row_group =row_group->next) - for (row = row_group->children; row; row = row->next) - for (cell = row->children; cell; cell = cell->next) { - assert(cell->type == BOX_TABLE_CELL); - assert(cell->style); - /** TODO: Handle colspan="0" correctly. - * It's currently converted to 1 in box normaisation */ - assert(cell->columns != 0); + NSLOG(layout, DEBUG, "left %i, right %i, top %i, bottom %i", left, + right, top, bottom); - if (cell->columns != 1) - continue; + *x = left; + *y = top; +} - layout_minmax_block(cell, font_func); - i = cell->start_column; - if (col[i].positioned) - continue; +/** + * Adjust positions of relatively positioned boxes. + * + * \param len_ctx Length conversion context + * \param root box to adjust the position of + * \param fp box which forms the block formatting context for children of + * "root" which are floats + * \param fx x offset due to intervening relatively positioned boxes + * between current box, "root", and the block formatting context + * box, "fp", for float children of "root" + * \param fy y offset due to intervening relatively positioned boxes + * between current box, "root", and the block formatting context + * box, "fp", for float children of "root" + */ +static void +layout_position_relative( + const nscss_len_ctx *len_ctx, + struct box *root, + struct box *fp, + int fx, + int fy) +{ + struct box *box; /* for children of "root" */ + struct box *fn; /* for block formatting context box for children of + * "box" */ + struct box *fc; /* for float children of the block formatting context, + * "fp" */ + int x, y; /* for the offsets resulting from any relative + * positioning on the current block */ + int fnx, fny; /* for affsets which apply to flat children of "box" */ - /* update column min, max widths using cell widths */ - if (col[i].min < cell->min_width) - col[i].min = cell->min_width; - if (col[i].max < cell->max_width) - col[i].max = cell->max_width; - } + /**\todo ensure containing box is large enough after moving boxes */ - /* 2nd pass: cells which span multiple columns */ - for (row_group = table->children; row_group; row_group =row_group->next) - for (row = row_group->children; row; row = row->next) - for (cell = row->children; cell; cell = cell->next) { - unsigned int flexible_columns = 0; - int min = 0, max = 0, fixed_width = 0, extra; + assert(root); - if (cell->columns == 1) - continue; + /* Normal children */ + for (box = root->children; box; box = box->next) { - layout_minmax_block(cell, font_func); - i = cell->start_column; + if (box->type == BOX_TEXT) + continue; - /* find min width so far of spanned columns, and count - * number of non-fixed spanned columns and total fixed width */ - for (j = 0; j != cell->columns; j++) { - min += col[i + j].min; - if (col[i + j].type == COLUMN_WIDTH_FIXED) - fixed_width += col[i + j].width; - else - flexible_columns++; - } - min += (cell->columns - 1) * border_spacing_h; + /* If relatively positioned, get offsets */ + if (box->style && css_computed_position(box->style) == + CSS_POSITION_RELATIVE) + layout_compute_relative_offset( + len_ctx, box, &x, &y); + else + x = y = 0; - /* distribute extra min to spanned columns */ - if (min < cell->min_width) { - if (flexible_columns == 0) { - extra = 1 + (cell->min_width - min) / - cell->columns; - for (j = 0; j != cell->columns; j++) { - col[i + j].min += extra; - if (col[i + j].max < col[i + j].min) - col[i + j].max = col[i + j].min; - } - } else { - extra = 1 + (cell->min_width - min) / - flexible_columns; - for (j = 0; j != cell->columns; j++) { - if (col[i + j].type != - COLUMN_WIDTH_FIXED) { - col[i + j].min += extra; - if (col[i + j].max < - col[i + j].min) - col[i + j].max = - col[i + j].min; - } + /* Adjust float coordinates. + * (note float x and y are relative to their block formatting + * context box and not their parent) */ + if (box->style && (css_computed_float(box->style) == + CSS_FLOAT_LEFT || + css_computed_float(box->style) == + CSS_FLOAT_RIGHT) && + (fx != 0 || fy != 0)) { + /* box is a float and there is a float offset to + * apply */ + for (fc = fp->float_children; fc; fc = fc->next_float) { + if (box == fc->children) { + /* Box is floated in the block + * formatting context block, fp. + * Apply float offsets. */ + box->x += fx; + box->y += fy; + fx = fy = 0; } } } - /* find max width so far of spanned columns */ - for (j = 0; j != cell->columns; j++) - max += col[i + j].max; - max += (cell->columns - 1) * border_spacing_h; - - /* distribute extra max to spanned columns */ - if (max < cell->max_width && flexible_columns) { - extra = 1 + (cell->max_width - max) / flexible_columns; - for (j = 0; j != cell->columns; j++) - if (col[i + j].type != COLUMN_WIDTH_FIXED) - col[i + j].max += extra; + if (box->float_children) { + fn = box; + fnx = fny = 0; + } else { + fn = fp; + fnx = fx + x; + fny = fy + y; } - } - for (i = 0; i != table->columns; i++) { - if (col[i].max < col[i].min) { - box_dump(stderr, table, 0, true); - assert(0); - } - table_min += col[i].min; - table_max += col[i].max; - } + /* recurse first */ + layout_position_relative(len_ctx, box, fn, fnx, fny); - /* fixed width takes priority, unless it is too narrow */ - wtype = css_computed_width(table->style, &value, &unit); - if (wtype == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) { - int width = FIXTOINT(nscss_len2px(value, unit, table->style)); - if (table_min < width) - table_min = width; - if (table_max < width) - table_max = width; - } + /* Ignore things we're not interested in. */ + if (!box->style || (box->style && + css_computed_position(box->style) != + CSS_POSITION_RELATIVE)) + continue; - /* add margins, border, padding to min, max widths */ - calculate_mbp_width(table->style, LEFT, true, true, true, - &extra_fixed, &extra_frac); - calculate_mbp_width(table->style, RIGHT, true, true, true, - &extra_fixed, &extra_frac); - if (extra_fixed < 0) - extra_fixed = 0; - if (extra_frac < 0) - extra_frac = 0; - if (1.0 <= extra_frac) - extra_frac = 0.9; - table->min_width = (table_min + extra_fixed) / (1.0 - extra_frac); - table->max_width = (table_max + extra_fixed) / (1.0 - extra_frac); - table->min_width += (table->columns + 1) * border_spacing_h; - table->max_width += (table->columns + 1) * border_spacing_h; + box->x += x; + box->y += y; - assert(0 <= table->min_width && table->min_width <= table->max_width); + /* Handle INLINEs - their "children" are in fact + * the sibling boxes between the INLINE and + * INLINE_END boxes */ + if (box->type == BOX_INLINE && box->inline_end) { + struct box *b; + for (b = box->next; b && b != box->inline_end; + b = b->next) { + b->x += x; + b->y += y; + } + } + } } /** * Find a box's bounding box relative to itself, i.e. the box's border edge box * + * \param len_ctx Length conversion context * \param box box find bounding box of * \param desc_x0 updated to left of box's bbox * \param desc_y0 updated to top of box's bbox @@ -5103,9 +5167,11 @@ layout_minmax_table(struct box *table, const struct gui_layout_table *font_func) * \param desc_y1 updated to bottom of box's bbox */ static void -layout_get_box_bbox(struct box *box, - int *desc_x0, int *desc_y0, - int *desc_x1, int *desc_y1) +layout_get_box_bbox( + const nscss_len_ctx *len_ctx, + struct box *box, + int *desc_x0, int *desc_y0, + int *desc_x1, int *desc_y1) { *desc_x0 = -box->border[LEFT].width; *desc_y0 = -box->border[TOP].width; @@ -5125,7 +5191,8 @@ layout_get_box_bbox(struct box *box, int text_height; css_computed_font_size(box->style, &font_size, &font_unit); - text_height = nscss_len2px(font_size, font_unit, box->style); + text_height = nscss_len2px(len_ctx, font_size, font_unit, + box->style); text_height = FIXTOINT(text_height * 3 / 4); *desc_y0 = (*desc_y0 < -text_height) ? *desc_y0 : -text_height; } @@ -5135,16 +5202,19 @@ layout_get_box_bbox(struct box *box, /** * Apply changes to box descendant_[xy][01] values due to given child. * - * \param box box to update - * \param child a box, which may affect box's descendant bbox - * \param off_x offset to apply to child->x coord to treat as child of box - * \param off_y offset to apply to child->y coord to treat as child of box + * \param len_ctx Length conversion context + * \param box box to update + * \param child a box, which may affect box's descendant bbox + * \param off_x offset to apply to child->x coord to treat as child of box + * \param off_y offset to apply to child->y coord to treat as child of box */ static void -layout_update_descendant_bbox(struct box *box, - struct box *child, - int off_x, - int off_y) +layout_update_descendant_bbox( + const nscss_len_ctx *len_ctx, + struct box *box, + struct box *child, + int off_x, + int off_y) { int child_desc_x0, child_desc_y0, child_desc_x1, child_desc_y1; @@ -5164,7 +5234,8 @@ layout_update_descendant_bbox(struct box *box, } /* Get child's border edge */ - layout_get_box_bbox(child, &child_desc_x0, &child_desc_y0, + layout_get_box_bbox(len_ctx, child, + &child_desc_x0, &child_desc_y0, &child_desc_x1, &child_desc_y1); if (overflow_x == CSS_OVERFLOW_VISIBLE && @@ -5197,8 +5268,16 @@ layout_update_descendant_bbox(struct box *box, } -/* exported function documented in render/layout.h */ -void layout_calculate_descendant_bboxes(struct box *box) +/** + * Recursively calculate the descendant_[xy][01] values for a laid-out box tree + * and inform iframe browser windows of their size and position. + * + * \param len_ctx Length conversion context + * \param box tree of boxes to update + */ +static void layout_calculate_descendant_bboxes( + const nscss_len_ctx *len_ctx, + struct box *box) { struct box *child; @@ -5207,7 +5286,8 @@ void layout_calculate_descendant_bboxes(struct box *box) /* assert((box->width >= 0) && (box->height >= 0)); */ /* Initialise box's descendant box to border edge box */ - layout_get_box_bbox(box, &box->descendant_x0, &box->descendant_y0, + layout_get_box_bbox(len_ctx, box, + &box->descendant_x0, &box->descendant_y0, &box->descendant_x1, &box->descendant_y1); /* Extend it to contain HTML contents if box is replaced */ @@ -5240,7 +5320,7 @@ void layout_calculate_descendant_bboxes(struct box *box) child->type == BOX_FLOAT_RIGHT) continue; - layout_update_descendant_bbox(box, child, + layout_update_descendant_bbox(len_ctx, box, child, box->x, box->y); if (child == box->inline_end) @@ -5258,7 +5338,7 @@ void layout_calculate_descendant_bboxes(struct box *box) child->type == BOX_FLOAT_RIGHT) continue; - layout_calculate_descendant_bboxes(child); + layout_calculate_descendant_bboxes(len_ctx, child); if (box->style && css_computed_overflow_x(box->style) == CSS_OVERFLOW_HIDDEN && @@ -5266,22 +5346,73 @@ void layout_calculate_descendant_bboxes(struct box *box) CSS_OVERFLOW_HIDDEN) continue; - layout_update_descendant_bbox(box, child, 0, 0); + layout_update_descendant_bbox(len_ctx, box, child, 0, 0); } for (child = box->float_children; child; child = child->next_float) { assert(child->type == BOX_FLOAT_LEFT || child->type == BOX_FLOAT_RIGHT); - layout_calculate_descendant_bboxes(child); + layout_calculate_descendant_bboxes(len_ctx, child); - layout_update_descendant_bbox(box, child, 0, 0); + layout_update_descendant_bbox(len_ctx, box, child, 0, 0); } if (box->list_marker) { child = box->list_marker; - layout_calculate_descendant_bboxes(child); + layout_calculate_descendant_bboxes(len_ctx, child); + + layout_update_descendant_bbox(len_ctx, box, child, 0, 0); + } +} + + +/* exported function documented in render/layout.h */ +bool layout_document(html_content *content, int width, int height) +{ + bool ret; + struct box *doc = content->layout; + const struct gui_layout_table *font_func = content->font_func; + + layout_minmax_block(doc, font_func, content); + + layout_block_find_dimensions(&content->len_ctx, + width, height, 0, 0, doc); + doc->x = doc->margin[LEFT] + doc->border[LEFT].width; + doc->y = doc->margin[TOP] + doc->border[TOP].width; + width -= doc->margin[LEFT] + doc->border[LEFT].width + + doc->padding[LEFT] + doc->padding[RIGHT] + + doc->border[RIGHT].width + doc->margin[RIGHT]; + if (width < 0) { + width = 0; + } + doc->width = width; + + ret = layout_block_context(doc, height, content); - layout_update_descendant_bbox(box, child, 0, 0); + /* make <html> and <body> fill available height */ + if (doc->y + doc->padding[TOP] + doc->height + doc->padding[BOTTOM] + + doc->border[BOTTOM].width + doc->margin[BOTTOM] < + height) { + doc->height = height - (doc->y + doc->padding[TOP] + + doc->padding[BOTTOM] + + doc->border[BOTTOM].width + + doc->margin[BOTTOM]); + if (doc->children) + doc->children->height = doc->height - + (doc->children->margin[TOP] + + doc->children->border[TOP].width + + doc->children->padding[TOP] + + doc->children->padding[BOTTOM] + + doc->children->border[BOTTOM].width + + doc->children->margin[BOTTOM]); } + + layout_lists(doc, font_func, &content->len_ctx); + layout_position_absolute(doc, doc, 0, 0, content); + layout_position_relative(&content->len_ctx, doc, doc, 0, 0); + + layout_calculate_descendant_bboxes(&content->len_ctx, doc); + + return ret; } diff --git a/render/layout.h b/render/layout.h index 78a3002..cd5ddd7 100644 --- a/render/layout.h +++ b/render/layout.h @@ -42,35 +42,4 @@ struct gui_layout_table; */ bool layout_document(struct html_content *content, int width, int height); -/** - * Layout lines of text or inline boxes with floats. - * - * \param box inline container box - * \param width horizontal space available - * \param cont ancestor box which defines horizontal space, for floats - * \param cx box position relative to cont - * \param cy box position relative to cont - * \param content memory pool for any new boxes - * \return true on success, false on memory exhaustion - */ -bool layout_inline_container(struct box *box, int width, struct box *cont, int cx, int cy, struct html_content *content); - -/** - * Recursively calculate the descendant_[xy][01] values for a laid-out box tree - * and inform iframe browser windows of their size and position. - * - * \param box tree of boxes to update - */ -void layout_calculate_descendant_bboxes(struct box *box); - -/** - * Calculate minimum and maximum width of a table. - * - * \param table box of type TABLE - * \param font_func Font functions - * \post table->min_width and table->max_width filled in, - * 0 <= table->min_width <= table->max_width - */ -void layout_minmax_table(struct box *table, const struct gui_layout_table *font_func); - #endif diff --git a/render/search.c b/render/search.c index 8f21d87..ca95201 100644 --- a/render/search.c +++ b/render/search.c @@ -621,13 +621,14 @@ void search_show_all(bool all, struct search_context *context) if (!a->sel) continue; - selection_init(a->sel, html->layout); + selection_init(a->sel, html->layout, + &html->len_ctx); } else { a->sel = selection_create(context->c, false); if (!a->sel) continue; - selection_init(a->sel, NULL); + selection_init(a->sel, NULL, NULL); } selection_set_start(a->sel, a->start_idx); diff --git a/render/table.c b/render/table.c index c41b913..08a2e80 100644 --- a/render/table.c +++ b/render/table.c @@ -45,31 +45,57 @@ struct border { css_unit unit; /**< border-width units */ }; -static void table_used_left_border_for_cell(struct box *cell); -static void table_used_top_border_for_cell(struct box *cell); -static void table_used_right_border_for_cell(struct box *cell); -static void table_used_bottom_border_for_cell(struct box *cell); -static bool table_border_is_more_eyecatching(const struct border *a, - box_type a_src, const struct border *b, box_type b_src); -static void table_cell_top_process_table(struct box *table, struct border *a, +static void table_used_left_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell); +static void table_used_top_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell); +static void table_used_right_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell); +static void table_used_bottom_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell); +static bool table_border_is_more_eyecatching( + const nscss_len_ctx *len_ctx, + const struct border *a, + box_type a_src, + const struct border *b, + box_type b_src); +static void table_cell_top_process_table( + const nscss_len_ctx *len_ctx, + struct box *table, + struct border *a, + box_type *a_src); +static bool table_cell_top_process_group( + const nscss_len_ctx *len_ctx, + struct box *cell, + struct box *group, + struct border *a, + box_type *a_src); +static bool table_cell_top_process_row( + const nscss_len_ctx *len_ctx, + struct box *cell, + struct box *row, + struct border *a, box_type *a_src); -static bool table_cell_top_process_group(struct box *cell, struct box *group, - struct border *a, box_type *a_src); -static bool table_cell_top_process_row(struct box *cell, struct box *row, - struct border *a, box_type *a_src); /** * Determine the column width types for a table. * - * \param table box of type BOX_TABLE + * \param len_ctx Length conversion context + * \param table box of type BOX_TABLE * \return true on success, false on memory exhaustion * * The table->col array is allocated and type and width are filled in for each * column. */ -bool table_calculate_column_types(struct box *table) +bool table_calculate_column_types( + const nscss_len_ctx *len_ctx, + struct box *table) { unsigned int i, j; struct column *col; @@ -109,7 +135,7 @@ bool table_calculate_column_types(struct box *table) css_computed_position(cell->style) != CSS_POSITION_FIXED) { col[i].positioned = false; - } + } type = css_computed_width(cell->style, &value, &unit); @@ -117,8 +143,8 @@ bool table_calculate_column_types(struct box *table) if (col[i].type != COLUMN_WIDTH_FIXED && type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT) { col[i].type = COLUMN_WIDTH_FIXED; - col[i].width = FIXTOINT(nscss_len2px(value, unit, - cell->style)); + col[i].width = FIXTOINT(nscss_len2px(len_ctx, + value, unit, cell->style)); if (col[i].width < 0) col[i].width = 0; continue; @@ -181,7 +207,7 @@ bool table_calculate_column_types(struct box *table) if (type == CSS_WIDTH_SET && unit != CSS_UNIT_PCT && fixed_columns + unknown_columns == cell->columns) { - int width = (FIXTOFLT(nscss_len2px(value, unit, + int width = (FIXTOFLT(nscss_len2px(len_ctx, value, unit, cell->style)) - fixed_width) / unknown_columns; if (width < 0) @@ -235,11 +261,14 @@ bool table_calculate_column_types(struct box *table) /** * Calculate used values of border-{trbl}-{style,color,width} for table cells. * - * \param cell Table cell to consider + * \param len_ctx Length conversion context + * \param cell Table cell to consider * * \post \a cell's border array is populated */ -void table_used_border_for_cell(struct box *cell) +void table_used_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell) { int side; @@ -257,7 +286,8 @@ void table_used_border_for_cell(struct box *cell) &cell->border[LEFT].c); css_computed_border_left_width(cell->style, &width, &unit); cell->border[LEFT].width = - FIXTOINT(nscss_len2px(width, unit, cell->style)); + FIXTOINT(nscss_len2px(len_ctx, + width, unit, cell->style)); /* Top border */ cell->border[TOP].style = @@ -266,7 +296,8 @@ void table_used_border_for_cell(struct box *cell) &cell->border[TOP].c); css_computed_border_top_width(cell->style, &width, &unit); cell->border[TOP].width = - FIXTOINT(nscss_len2px(width, unit, cell->style)); + FIXTOINT(nscss_len2px(len_ctx, + width, unit, cell->style)); /* Right border */ cell->border[RIGHT].style = @@ -275,7 +306,8 @@ void table_used_border_for_cell(struct box *cell) &cell->border[RIGHT].c); css_computed_border_right_width(cell->style, &width, &unit); cell->border[RIGHT].width = - FIXTOINT(nscss_len2px(width, unit, cell->style)); + FIXTOINT(nscss_len2px(len_ctx, + width, unit, cell->style)); /* Bottom border */ cell->border[BOTTOM].style = @@ -284,19 +316,20 @@ void table_used_border_for_cell(struct box *cell) &cell->border[BOTTOM].c); css_computed_border_bottom_width(cell->style, &width, &unit); cell->border[BOTTOM].width = - FIXTOINT(nscss_len2px(width, unit, cell->style)); + FIXTOINT(nscss_len2px(len_ctx, + width, unit, cell->style)); } else { /* Left border */ - table_used_left_border_for_cell(cell); + table_used_left_border_for_cell(len_ctx, cell); /* Top border */ - table_used_top_border_for_cell(cell); + table_used_top_border_for_cell(len_ctx, cell); /* Right border */ - table_used_right_border_for_cell(cell); + table_used_right_border_for_cell(len_ctx, cell); /* Bottom border */ - table_used_bottom_border_for_cell(cell); + table_used_bottom_border_for_cell(len_ctx, cell); } /* Finally, ensure that any borders configured as @@ -316,9 +349,12 @@ void table_used_border_for_cell(struct box *cell) /** * Calculate used values of border-left-{style,color,width} * - * \param cell Table cell to consider + * \param len_ctx Length conversion context + * \param cell Table cell to consider */ -void table_used_left_border_for_cell(struct box *cell) +void table_used_left_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell) { struct border a, b; box_type a_src, b_src; @@ -329,7 +365,7 @@ void table_used_left_border_for_cell(struct box *cell) a.style = css_computed_border_left_style(cell->style); a.color = css_computed_border_left_color(cell->style, &a.c); css_computed_border_left_width(cell->style, &a.width, &a.unit); - a.width = nscss_len2px(a.width, a.unit, cell->style); + a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style); a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; @@ -362,11 +398,12 @@ void table_used_left_border_for_cell(struct box *cell) b.style = css_computed_border_right_style(prev->style); b.color = css_computed_border_right_color(prev->style, &b.c); css_computed_border_right_width(prev->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, prev->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, prev->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_CELL; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -384,12 +421,13 @@ void table_used_left_border_for_cell(struct box *cell) row->style, &b.c); css_computed_border_left_width( row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, + b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - - if (table_border_is_more_eyecatching(&a, a_src, - &b, b_src)) { + + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -403,11 +441,12 @@ void table_used_left_border_for_cell(struct box *cell) b.style = css_computed_border_left_style(group->style); b.color = css_computed_border_left_color(group->style, &b.c); css_computed_border_left_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -416,11 +455,12 @@ void table_used_left_border_for_cell(struct box *cell) b.style = css_computed_border_left_style(table->style); b.color = css_computed_border_left_color(table->style, &b.c); css_computed_border_left_width(table->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, table->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -429,16 +469,19 @@ void table_used_left_border_for_cell(struct box *cell) /* a now contains the used left border for the cell */ cell->border[LEFT].style = a.style; cell->border[LEFT].c = a.c; - cell->border[LEFT].width = - FIXTOINT(nscss_len2px(a.width, a.unit, cell->style)); + cell->border[LEFT].width = FIXTOINT(nscss_len2px(len_ctx, + a.width, a.unit, cell->style)); } /** * Calculate used values of border-top-{style,color,width} * - * \param cell Table cell to consider + * \param len_ctx Length conversion context + * \param cell Table cell to consider */ -void table_used_top_border_for_cell(struct box *cell) +void table_used_top_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell) { struct border a, b; box_type a_src, b_src; @@ -449,7 +492,7 @@ void table_used_top_border_for_cell(struct box *cell) a.style = css_computed_border_top_style(cell->style); css_computed_border_top_color(cell->style, &a.c); css_computed_border_top_width(cell->style, &a.width, &a.unit); - a.width = nscss_len2px(a.width, a.unit, cell->style); + a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style); a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; @@ -457,18 +500,18 @@ void table_used_top_border_for_cell(struct box *cell) b.style = css_computed_border_top_style(row->style); css_computed_border_top_color(row->style, &b.c); css_computed_border_top_width(row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, &a, a_src, &b, b_src)) { a = b; a_src = b_src; } if (row->prev != NULL) { /* Consider row(s) above */ - while (table_cell_top_process_row(cell, row->prev, + while (table_cell_top_process_row(len_ctx, cell, row->prev, &a, &a_src) == false) { if (row->prev->prev == NULL) { /* Consider row group */ @@ -489,26 +532,29 @@ void table_used_top_border_for_cell(struct box *cell) b.style = css_computed_border_top_style(group->style); b.color = css_computed_border_top_color(group->style, &b.c); css_computed_border_top_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } if (group->prev == NULL) { /* Top border of table */ - table_cell_top_process_table(group->parent, &a, &a_src); + table_cell_top_process_table(len_ctx, + group->parent, &a, &a_src); } else { /* Process previous group(s) */ - while (table_cell_top_process_group(cell, group->prev, + while (table_cell_top_process_group(len_ctx, + cell, group->prev, &a, &a_src) == false) { if (group->prev->prev == NULL) { /* Top border of table */ - table_cell_top_process_table( - group->parent, + table_cell_top_process_table(len_ctx, + group->parent, &a, &a_src); break; } else { @@ -521,16 +567,19 @@ void table_used_top_border_for_cell(struct box *cell) /* a now contains the used top border for the cell */ cell->border[TOP].style = a.style; cell->border[TOP].c = a.c; - cell->border[TOP].width = - FIXTOINT(nscss_len2px(a.width, a.unit, cell->style)); + cell->border[TOP].width = FIXTOINT(nscss_len2px(len_ctx, + a.width, a.unit, cell->style)); } /** * Calculate used values of border-right-{style,color,width} * - * \param cell Table cell to consider + * \param len_ctx Length conversion context + * \param cell Table cell to consider */ -void table_used_right_border_for_cell(struct box *cell) +void table_used_right_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell) { struct border a, b; box_type a_src, b_src; @@ -541,7 +590,7 @@ void table_used_right_border_for_cell(struct box *cell) a.style = css_computed_border_right_style(cell->style); css_computed_border_right_color(cell->style, &a.c); css_computed_border_right_width(cell->style, &a.width, &a.unit); - a.width = nscss_len2px(a.width, a.unit, cell->style); + a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style); a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; @@ -565,12 +614,13 @@ void table_used_right_border_for_cell(struct box *cell) row->style, &b.c); css_computed_border_right_width( row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, + b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - - if (table_border_is_more_eyecatching(&a, a_src, - &b, b_src)) { + + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -583,13 +633,14 @@ void table_used_right_border_for_cell(struct box *cell) /* Row group -- consider its right border */ b.style = css_computed_border_right_style(group->style); b.color = css_computed_border_right_color(group->style, &b.c); - css_computed_border_right_width(group->style, + css_computed_border_right_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -599,11 +650,12 @@ void table_used_right_border_for_cell(struct box *cell) b.color = css_computed_border_right_color(table->style, &b.c); css_computed_border_right_width(table->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, table->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -612,16 +664,19 @@ void table_used_right_border_for_cell(struct box *cell) /* a now contains the used right border for the cell */ cell->border[RIGHT].style = a.style; cell->border[RIGHT].c = a.c; - cell->border[RIGHT].width = - FIXTOINT(nscss_len2px(a.width, a.unit, cell->style)); + cell->border[RIGHT].width = FIXTOINT(nscss_len2px(len_ctx, + a.width, a.unit, cell->style)); } /** * Calculate used values of border-bottom-{style,color,width} * - * \param cell Table cell to consider + * \param len_ctx Length conversion context + * \param cell Table cell to consider */ -void table_used_bottom_border_for_cell(struct box *cell) +void table_used_bottom_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell) { struct border a, b; box_type a_src, b_src; @@ -632,7 +687,7 @@ void table_used_bottom_border_for_cell(struct box *cell) a.style = css_computed_border_bottom_style(cell->style); css_computed_border_bottom_color(cell->style, &a.c); css_computed_border_bottom_width(cell->style, &a.width, &a.unit); - a.width = nscss_len2px(a.width, a.unit, cell->style); + a.width = nscss_len2px(len_ctx, a.width, a.unit, cell->style); a.unit = CSS_UNIT_PX; a_src = BOX_TABLE_CELL; @@ -656,11 +711,12 @@ void table_used_bottom_border_for_cell(struct box *cell) b.style = css_computed_border_bottom_style(row->style); b.color = css_computed_border_bottom_color(row->style, &b.c); css_computed_border_bottom_width(row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -670,11 +726,12 @@ void table_used_bottom_border_for_cell(struct box *cell) b.color = css_computed_border_bottom_color(group->style, &b.c); css_computed_border_bottom_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; a_src = b_src; } @@ -684,11 +741,12 @@ void table_used_bottom_border_for_cell(struct box *cell) b.color = css_computed_border_bottom_color(table->style, &b.c); css_computed_border_bottom_width(table->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, table->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; - if (table_border_is_more_eyecatching(&a, a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + &a, a_src, &b, b_src)) { a = b; } } @@ -696,21 +754,26 @@ void table_used_bottom_border_for_cell(struct box *cell) /* a now contains the used bottom border for the cell */ cell->border[BOTTOM].style = a.style; cell->border[BOTTOM].c = a.c; - cell->border[BOTTOM].width = - FIXTOINT(nscss_len2px(a.width, a.unit, cell->style)); + cell->border[BOTTOM].width = FIXTOINT(nscss_len2px(len_ctx, + a.width, a.unit, cell->style)); } /** * Determine if a border style is more eyecatching than another * - * \param a Reference border style - * \param a_src Source of \a a - * \param b Candidate border style - * \param b_src Source of \a b + * \param len_ctx Length conversion context + * \param a Reference border style + * \param a_src Source of \a a + * \param b Candidate border style + * \param b_src Source of \a b * \return True if \a b is more eyecatching than \a a */ -bool table_border_is_more_eyecatching(const struct border *a, - box_type a_src, const struct border *b, box_type b_src) +bool table_border_is_more_eyecatching( + const nscss_len_ctx *len_ctx, + const struct border *a, + box_type a_src, + const struct border *b, + box_type b_src) { css_fixed awidth, bwidth; int impact = 0; @@ -731,8 +794,8 @@ bool table_border_is_more_eyecatching(const struct border *a, * if they've come from a computed style. */ assert(a->unit != CSS_UNIT_EM && a->unit != CSS_UNIT_EX); assert(b->unit != CSS_UNIT_EM && b->unit != CSS_UNIT_EX); - awidth = nscss_len2px(a->width, a->unit, NULL); - bwidth = nscss_len2px(b->width, b->unit, NULL); + awidth = nscss_len2px(len_ctx, a->width, a->unit, NULL); + bwidth = nscss_len2px(len_ctx, b->width, b->unit, NULL); if (awidth < bwidth) return true; @@ -811,14 +874,18 @@ bool table_border_is_more_eyecatching(const struct border *a, /** * Process a table * - * \param table Table to process - * \param a Current border style for cell - * \param a_src Source of \a a + * \param len_ctx Length conversion context + * \param table Table to process + * \param a Current border style for cell + * \param a_src Source of \a a * * \post \a a will be updated with most eyecatching style * \post \a a_src will be updated also */ -void table_cell_top_process_table(struct box *table, struct border *a, +void table_cell_top_process_table( + const nscss_len_ctx *len_ctx, + struct box *table, + struct border *a, box_type *a_src) { struct border b; @@ -828,11 +895,11 @@ void table_cell_top_process_table(struct box *table, struct border *a, b.style = css_computed_border_top_style(table->style); b.color = css_computed_border_top_color(table->style, &b.c); css_computed_border_top_width(table->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, table->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, table->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE; - if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } @@ -841,17 +908,22 @@ void table_cell_top_process_table(struct box *table, struct border *a, /** * Process a group * - * \param cell Cell being considered - * \param group Group to process - * \param a Current border style for cell - * \param a_src Source of \a a + * \param len_ctx Length conversion context + * \param cell Cell being considered + * \param group Group to process + * \param a Current border style for cell + * \param a_src Source of \a a * \return true if group has non-empty rows, false otherwise * * \post \a a will be updated with most eyecatching style * \post \a a_src will be updated also */ -bool table_cell_top_process_group(struct box *cell, struct box *group, - struct border *a, box_type *a_src) +bool table_cell_top_process_group( + const nscss_len_ctx *len_ctx, + struct box *cell, + struct box *group, + struct border *a, + box_type *a_src) { struct border b; box_type b_src; @@ -860,11 +932,11 @@ bool table_cell_top_process_group(struct box *cell, struct box *group, b.style = css_computed_border_bottom_style(group->style); b.color = css_computed_border_bottom_color(group->style, &b.c); css_computed_border_bottom_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } @@ -873,7 +945,7 @@ bool table_cell_top_process_group(struct box *cell, struct box *group, /* Process rows in group, starting with last */ struct box *row = group->last; - while (table_cell_top_process_row(cell, row, + while (table_cell_top_process_row(len_ctx, cell, row, a, a_src) == false) { if (row->prev == NULL) { return false; @@ -886,11 +958,12 @@ bool table_cell_top_process_group(struct box *cell, struct box *group, b.style = css_computed_border_top_style(group->style); b.color = css_computed_border_top_color(group->style, &b.c); css_computed_border_top_width(group->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, group->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, group->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW_GROUP; - if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } @@ -904,17 +977,22 @@ bool table_cell_top_process_group(struct box *cell, struct box *group, /** * Process a row * - * \param cell Cell being considered - * \param row Row to process - * \param a Current border style for cell - * \param a_src Source of \a a + * \param len_ctx Length conversion context + * \param cell Cell being considered + * \param row Row to process + * \param a Current border style for cell + * \param a_src Source of \a a * \return true if row has cells, false otherwise * * \post \a a will be updated with most eyecatching style * \post \a a_src will be updated also */ -bool table_cell_top_process_row(struct box *cell, struct box *row, - struct border *a, box_type *a_src) +bool table_cell_top_process_row( + const nscss_len_ctx *len_ctx, + struct box *cell, + struct box *row, + struct border *a, + box_type *a_src) { struct border b; box_type b_src; @@ -923,11 +1001,11 @@ bool table_cell_top_process_row(struct box *cell, struct box *row, b.style = css_computed_border_bottom_style(row->style); b.color = css_computed_border_bottom_color(row->style, &b.c); css_computed_border_bottom_width(row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } @@ -937,11 +1015,12 @@ bool table_cell_top_process_row(struct box *cell, struct box *row, b.style = css_computed_border_top_style(row->style); b.color = css_computed_border_top_color(row->style, &b.c); css_computed_border_top_width(row->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, row->style); + b.width = nscss_len2px(len_ctx, b.width, b.unit, row->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_ROW; - if (table_border_is_more_eyecatching(a, *a_src, &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } @@ -975,13 +1054,13 @@ bool table_cell_top_process_row(struct box *cell, struct box *row, c->style, &b.c); css_computed_border_bottom_width(c->style, &b.width, &b.unit); - b.width = nscss_len2px(b.width, b.unit, - c->style); + b.width = nscss_len2px(len_ctx, + b.width, b.unit, c->style); b.unit = CSS_UNIT_PX; b_src = BOX_TABLE_CELL; - if (table_border_is_more_eyecatching(a, *a_src, - &b, b_src)) { + if (table_border_is_more_eyecatching(len_ctx, + a, *a_src, &b, b_src)) { *a = b; *a_src = b_src; } diff --git a/render/table.h b/render/table.h index ecd3043..2eeffe6 100644 --- a/render/table.h +++ b/render/table.h @@ -28,7 +28,11 @@ struct box; -bool table_calculate_column_types(struct box *table); -void table_used_border_for_cell(struct box *cell); +bool table_calculate_column_types( + const nscss_len_ctx *len_ctx, + struct box *table); +void table_used_border_for_cell( + const nscss_len_ctx *len_ctx, + struct box *cell); #endif diff --git a/render/textplain.c b/render/textplain.c index ab2d559..0036eb5 100644 --- a/render/textplain.c +++ b/render/textplain.c @@ -988,7 +988,7 @@ textplain_open(struct content *c, text->bw = bw; /* text selection */ - selection_init(&text->sel, NULL); + selection_init(&text->sel, NULL, NULL); } diff --git a/utils/filename.c b/utils/filename.c index 01a403f..f0e1bb0 100644 --- a/utils/filename.c +++ b/utils/filename.c @@ -272,15 +272,19 @@ bool filename_flush_directory(const char *folder, int depth) parent = opendir(folder); while ((entry = readdir(parent))) { - struct stat statbuf; + int written; + struct stat statbuf; /* Ignore '.' and '..' */ if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) continue; - snprintf(child, sizeof(child), "%s/%s", folder, entry->d_name); - child[sizeof(child) - 1] = '\0'; + written = snprintf(child, sizeof(child), "%s/%s", + folder, entry->d_name); + if (written == sizeof(child)) { + child[sizeof(child) - 1] = '\0'; + } if (stat(child, &statbuf) == -1) { NSLOG(netsurf, INFO, "Unable to stat %s: %s", child, @@ -383,16 +387,21 @@ bool filename_delete_recursive(char *folder) parent = opendir(folder); while ((entry = readdir(parent))) { + int written; + /* Ignore '.' and '..' */ if (strcmp(entry->d_name, ".") == 0 || strcmp(entry->d_name, "..") == 0) continue; - snprintf(child, sizeof(child), "%s/%s", folder, entry->d_name); - child[sizeof(child) - 1] = '\0'; + written = snprintf(child, sizeof(child), "%s/%s", + folder, entry->d_name); + if (written == sizeof(child)) { + child[sizeof(child) - 1] = '\0'; + } if (stat(child, &statbuf) == -1) { - NSLOG(netsurf, INFO, "Unable to stat %s: %s", child, + NSLOG(netsurf, INFO, "Unable to stat %s: %s", child, strerror(errno)); continue; } -- NetSurf Browser

5 years, 4 months

1
0
0 / 0

toolchains: branch chris/gcc6-os3 created. 1cdca17b13035aee852cd20f4b6c071a3e343991

by NetSurf Browser Project

Gitweb links: ...log http://git.netsurf-browser.org/toolchains.git/shortlog/1cdca17b13035aee85... ...commit http://git.netsurf-browser.org/toolchains.git/commit/1cdca17b13035aee852c... ...tree http://git.netsurf-browser.org/toolchains.git/tree/1cdca17b13035aee852cd2... The branch, chris/gcc6-os3 has been created at 1cdca17b13035aee852cd20f4b6c071a3e343991 (commit) - Log ----------------------------------------------------------------- commitdiff http://git.netsurf-browser.org/toolchains.git/commit/?id=1cdca17b13035aee... commit 1cdca17b13035aee852cd20f4b6c071a3e343991 Author: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Commit: Chris Young <chris(a)unsatisfactorysoftware.co.uk> Update to gcc 6.4 diff --git a/m68k-unknown-amigaos/Makefile b/m68k-unknown-amigaos/Makefile index 3aaf896..9ca522a 100644 --- a/m68k-unknown-amigaos/Makefile +++ b/m68k-unknown-amigaos/Makefile @@ -3,8 +3,8 @@ # sources -UPSTREAM_GCC_VERSION := 6.2.0 -UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.bz2 +UPSTREAM_GCC_VERSION := 6.4.0 +UPSTREAM_GCC_TARBALL := gcc-$(UPSTREAM_GCC_VERSION).tar.xz UPSTREAM_GCC_URI := http://ftp.gnu.org/gnu/gcc/gcc-$(UPSTREAM_GCC_VERSION)/$(UPSTREAM_GCC_TAR... UPSTREAM_BINUTILS_VERSION := 2.14 @@ -171,7 +171,7 @@ $(BUILDSTEPS)/srcdir-step2.d: $(BUILDSTEPS)/srcdir-step1.d $(SOURCESDIR)/$(UPSTR touch $@ $(BUILDSTEPS)/srcdir-step1.d: $(BUILDSTEPS)/$(UPSTREAM_GCC_TARBALL).d - tar xjf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) + tar xJf $(SOURCESDIR)/$(UPSTREAM_GCC_TARBALL) mv gcc-$(UPSTREAM_GCC_VERSION) $(GCC_SRCDIR) touch $@ diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/amigacollect2.c b/m68k-unknown-amigaos/recipes/files/gcc/gcc/amigacollect2.c deleted file mode 100644 index 97e5e55..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/amigacollect2.c +++ /dev/null @@ -1,349 +0,0 @@ -/* GG-local whole file: dynamic libraries */ -/* Supplimentary functions that get compiled and linked to collect2 for - AmigaOS target. - Copyright (C) 1996 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include "tm.h" - -/* From collect2.c: */ - -void maybe_unlink(const char *); -void fatal_perror(const char *, ...); -void fork_execute(const char *, char **); -void fatal(const char *, ...); - -extern char *c_file_name; -extern int debug; - -/* Local functions. */ - -static void safename (char *); -static void add_lib (const char *); -static void cat (const char *, FILE *); - -/* Names of temporary files we create. */ -#define XLIBS_C_NAME "xlibs.c" -#define XLIBS_O_NAME "xlibs.o" -#define SHARED_X_NAME "shared.x" - -/* Suffix which is prepended to "-l" options for dynamic libraries. */ -#define DYNAMIC_LIB_SUFFIX "_ixlibrary" - -/* Structure that holds library names. */ -struct liblist -{ - struct liblist *next; - char *name; - char *cname; -}; - -/* Not zero if "-static" was specified on GCC command line or if all the - libraries are static. */ -static int flag_static=0; - -/* Not zero if linking a base relative executable. This is recognized by - presence of "-m amiga_bss" on the linker's commandline. */ -static int flag_baserel=0; - -/* Not zero if some of the specified libraries are dynamic. */ -static int found_dynamic_libs=0; - -/* List of linker libraries. */ -struct liblist *head = NULL; - -/* Return 1 if collect2 should do something more apart from tlink. We want it - to call "postlink" and "strip" if linking with dynamic libraries. */ - -int -amigaos_do_collecting (void) -{ - return !flag_static; -} - -/* Check for presence of "-static" on the GCC command line. We should not do - collecting if this flag was specified. */ - -void -amigaos_gccopts_hook (const char *arg) -{ - if (strncmp(arg, "-static", strlen("-static"))==0) - flag_static=1; -} - -/* Replace unprintable characters with underscores. Used by "add_lib()". */ - -static void -safename (char *p) -{ - if (!ISALPHA(*p)) - *p = '_'; - p++; - while (*p) - { - if (!ISALNUM(*p)) - *p = '_'; - p++; - } -} - -/* Add a library to the list of dynamic libraries. First make sure that the - library is actually dynamic. Used by "amigaos_libname_hook()". */ - -static void -add_lib (const char *name) -{ - struct liblist *lib; - static char buf[256]; - - for (lib = head; lib; lib = lib->next) - if (!strcmp(lib->name, name)) - return; - - /* A2IXDIR_PREFIX is passed by "make". */ - sprintf(buf, A2IXDIR_PREFIX "/ldscripts/%s.x", name); - if (access(buf, R_OK)) - return; - - lib = (struct liblist*)xmalloc(sizeof(struct liblist)); - lib->name = xstrdup(name); - lib->cname = xstrdup(name); - safename(lib->cname); - lib->next = head; - head = lib; - - if (debug) - fprintf(stderr, "found dynamic library, name: %s, cname: %s\n", lib->name, - lib->cname); - - found_dynamic_libs=1; -} - -/* Check if the argument is a linker library. Call "add_lib()" if yes. */ - -void -amigaos_libname_hook (const char *arg) -{ - int len = strlen(arg); - if (flag_static) - return; - - if (len > 2 && !memcmp(arg, "-l", 2)) - add_lib(arg + 2); - else if (len > 2 && !strcmp(arg + len - 2, ".a")) - { - const char *lib; - - ((char*)arg)[len - 2] = '\0'; - lib = strrchr(arg, '/'); - if (lib == NULL) - lib = strrchr(arg, ':'); - if (lib == NULL) - lib = arg - 1; - if (!strncmp(lib + 1, "lib", 3)) - add_lib(lib + 4); - ((char *)arg)[len - 2] = '.'; - } -} - -/* Delete temporary files. */ - -void -amigaos_collect2_cleanup (void) -{ - if (flag_static) - return; - maybe_unlink(XLIBS_C_NAME); - maybe_unlink(XLIBS_O_NAME); - maybe_unlink(SHARED_X_NAME); -} - -/* Copy file named by FNAME to X. */ - -static void -cat (const char *fname, FILE *x) -{ -#define BUFSIZE 16384 - FILE *in; - static char buf[BUFSIZE]; - int bytes; - - in = fopen(fname, "r"); - if (in == NULL) - fatal_perror("%s", fname); - while (!feof(in) && (bytes = fread(buf, 1, BUFSIZE, in))) - fwrite(buf, 1, bytes, x); - fclose(in); -} - -/* If no dynamic libraries were found, perform like "-static". Otherwise, - create "xlibs.c", "shared.x" and invoke "gcc" to create "xlibs.o". We also - have to adjust the linker commandline. */ - -void -amigaos_prelink_hook (const char **ld1_argv, int *strip_flag) -{ - if (flag_static) - return; - - if (!found_dynamic_libs) - { - flag_static=1; - /* If the user has not requested "-static", but has requested "-s", - collect2 removes "-s" from the "ld1_argv", and calls "strip" after - linking. However, this would not be efficient if we linked the - executable without any dynamic library. In this case, we put "-s" - back. */ - if (*strip_flag) - { - /* Add "-s" as the last argument on the command line. */ - while (*ld1_argv) - ld1_argv++; - *ld1_argv++="-s"; - *ld1_argv=0; - *strip_flag=0; - } - } - else - { - FILE *x, *out; - struct liblist *lib; - static const char* argv[]={0, "-c", XLIBS_C_NAME, 0}; - const char **ld1_end, **ld1; - - /* Prepend suffixes to dynamic lib names. In addition, check if we are - linking a base relative executable. */ - for (ld1=ld1_argv; *ld1; ld1++) - { - int len=strlen(*ld1); - if (strncmp(*ld1, "-l", strlen("-l"))==0) - { - for (lib=head; lib; lib=lib->next) - if (strcmp(*ld1+strlen("-l"), lib->name)==0) - { - char *newname= - xmalloc(strlen(*ld1)+strlen(DYNAMIC_LIB_SUFFIX)+1); - strcpy(newname, *ld1); - strcat(newname, DYNAMIC_LIB_SUFFIX); - *ld1=newname; - break; - } - } - else if (len > 2 && !strcmp(*ld1 + len - 2, ".a")) - { - const char *libname; - int substituted=0; - - ((char *)(*ld1))[len - 2] = '\0'; - libname = strrchr(*ld1, '/'); - if (libname == NULL) - libname = strrchr(*ld1, ':'); - if (libname == NULL) - libname = *ld1 - 1; - if (!strncmp(libname + 1, "lib", 3)) - for (lib=head; lib; lib=lib->next) - if (strcmp(libname+4, lib->name)==0) - { - char *newname=xmalloc(strlen(*ld1)+ - strlen(DYNAMIC_LIB_SUFFIX)+3); - strcpy(newname, *ld1); - strcat(newname, DYNAMIC_LIB_SUFFIX); - strcat(newname, ".a"); - *ld1=newname; - substituted=1; - break; - } - if (!substituted) - ((char *)(*ld1))[len - 2] = '.'; - } - else if (strcmp(ld1[0], "-m")==0 && ld1[1] - && strcmp(ld1[1], "amiga_bss")==0) - { - flag_baserel=1; - break; - } - } - - out = fopen(XLIBS_C_NAME, "w"); - if (out == NULL) - fatal_perror("%s", XLIBS_C_NAME); - x = fopen(SHARED_X_NAME, "w"); - if (x == NULL) - fatal_perror("%s", SHARED_X_NAME); - - cat((flag_baserel ? A2IXDIR_PREFIX "/amiga_exe_baserel_script.x" - : A2IXDIR_PREFIX "/amiga_exe_script.x"), x); - for (lib = head; lib; lib = lib->next) - { - static char buf[256]; - sprintf(buf, A2IXDIR_PREFIX "/ldscripts/%s.x", lib->name); - fprintf(out, "extern long %sBase; long *__p%sBase = &%sBase;\n", - lib->cname, lib->cname, lib->cname); - cat(buf, x); - } /* {{ */ - fprintf(x, "}}\n"); - fclose(out); - fclose(x); - argv[0]=c_file_name; - fork_execute("gcc", (char **)argv); - - /* Unfortunately, unlike "-s", "-T" cannot be specified as the last - argument. We put it after "-L" args. */ - ld1_end=ld1_argv; - while (*ld1_end) - ld1_end++; - ld1_end++; - /* "ld1_end" now points after the terminating 0 of "ld1_argv". */ - - ld1=ld1_end-2; - while (ld1>ld1_argv && strncmp(*ld1, "-L", strlen("-L"))) - ld1--; - if (ld1==ld1_argv) - fatal("no -L arguments"); - ld1++; - /* "ld1" now points after "-L". */ - - /* Shift all the arguments after "-L" one position right. */ - memmove(ld1+1, ld1, (ld1_end-ld1)*sizeof(*ld1)); - /* Put -Tshared.x in the now empty space. */ - *ld1="-T" SHARED_X_NAME; - } -} - -/* Be lazy and just call "postlink". */ - -void -amigaos_postlink_hook (const char *output_file) -{ - static const char *argv[]={"postlink", 0, 0, 0}; - if (flag_static) - return; - - if (flag_baserel) - { - argv[1]="-baserel"; - argv[2]=output_file; - } - else - argv[1]=output_file; - fork_execute("postlink", (char **)argv); -} diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos-protos.h b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos-protos.h deleted file mode 100644 index dd059f8..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos-protos.h +++ /dev/null @@ -1,45 +0,0 @@ -/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 - Free Software Foundation, Inc. - Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). - Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -extern int amigaos_restore_a4 (void); -#ifdef RTX_CODE -extern int read_only_operand (rtx); -extern void amigaos_select_section (tree, int, unsigned HOST_WIDE_INT); -extern void amigaos_encode_section_info (tree, rtx, int); -extern void amigaos_alternate_pic_setup (FILE *); -extern void amigaos_prologue_begin_hook (FILE *, int); -extern void amigaos_alternate_frame_setup_f (FILE *, int); -extern void amigaos_alternate_frame_setup (FILE *, int); -extern struct rtx_def* gen_stack_cleanup_call (rtx, rtx); -extern void amigaos_alternate_allocate_stack (rtx *); -#ifdef TREE_CODE -extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *, tree); -extern void amigaos_function_arg_advance (CUMULATIVE_ARGS *); -extern struct rtx_def *amigaos_function_arg (CUMULATIVE_ARGS *, enum machine_mode, tree); -#endif -#endif -#ifdef TREE_CODE -extern tree amigaos_handle_decl_attribute (tree *, tree, tree, int, bool *); -extern tree amigaos_handle_type_attribute (tree *, tree, tree, int, bool *); -extern int amigaos_comp_type_attributes (tree, tree); -#endif diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.c b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.c deleted file mode 100644 index 2c5cab1..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.c +++ /dev/null @@ -1,461 +0,0 @@ -/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 - Free Software Foundation, Inc. - Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). - Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include "tm.h" -#include "rtl.h" -#include "output.h" -#include "tree.h" -#include "flags.h" -#include "expr.h" -#include "toplev.h" -#include "tm_p.h" - -static int amigaos_put_in_text (tree); -static rtx gen_stack_management_call (rtx, rtx, const char *); - -/* Baserel support. */ - -/* Does operand (which is a symbolic_operand) live in text space? If - so SYMBOL_REF_FLAG, which is set by ENCODE_SECTION_INFO, will be true. - - This function is used in base relative code generation. */ - -int -read_only_operand (rtx operand) -{ - if (GET_CODE (operand) == CONST) - operand = XEXP (XEXP (operand, 0), 0); - if (GET_CODE (operand) == SYMBOL_REF) - return SYMBOL_REF_FLAG (operand) || CONSTANT_POOL_ADDRESS_P (operand); - return 1; -} - -/* Choose the section to use for DECL. RELOC is true if its value contains - any relocatable expression. */ - -void -amigaos_select_section (tree decl, int reloc, - unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED) -{ - if (TREE_CODE (decl) == STRING_CST) - { - if (! flag_writable_strings) - readonly_data_section (); - else - data_section (); - } - else if (TREE_CODE (decl) == VAR_DECL) - { - if (TREE_READONLY (decl) - && ! TREE_THIS_VOLATILE (decl) - && DECL_INITIAL (decl) - && (DECL_INITIAL (decl) == error_mark_node - || TREE_CONSTANT (DECL_INITIAL (decl))) - && (!flag_pic || (flag_pic<3 && !reloc) - || SYMBOL_REF_FLAG (XEXP (DECL_RTL (decl), 0)))) - readonly_data_section (); - else - data_section (); - } - else if ((!flag_pic || (flag_pic<3 && !reloc)) && DECL_P(decl) - && SYMBOL_REF_FLAG (XEXP (DECL_RTL (decl), 0))) - readonly_data_section (); - else - data_section (); -} - -/* This function is used while generating a base relative code. - It returns 1 if a decl is not relocatable, i. e., if it can be put - in the text section. - Currently, it's very primitive: it just checks if the object size - is less than 4 bytes (i. e., if it can hold a pointer). It also - supports arrays and floating point types. */ - -static int -amigaos_put_in_text (tree decl) -{ - tree type = TREE_TYPE (decl); - if (TREE_CODE (type) == ARRAY_TYPE) - type = TREE_TYPE (type); - return (TREE_INT_CST_HIGH (TYPE_SIZE (type)) == 0 - && TREE_INT_CST_LOW (TYPE_SIZE (type)) < 32) - || FLOAT_TYPE_P (type); -} - -/* Record properties of a DECL into the associated SYMBOL_REF. */ - -void -amigaos_encode_section_info (tree decl, rtx rtl, int first) -{ - default_encode_section_info (decl, rtl, first); - - if (TREE_CODE (decl) == FUNCTION_DECL) - SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; - else - { - if ((RTX_UNCHANGING_P (rtl) && !MEM_VOLATILE_P (rtl) - && (flag_pic<3 || (TREE_CODE (decl) == STRING_CST - && !flag_writable_strings) - || amigaos_put_in_text (decl))) - || (TREE_CODE (decl) == VAR_DECL - && DECL_SECTION_NAME (decl) != NULL_TREE)) - SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; - } -} - -/* Common routine used to check if a4 should be preserved/restored. */ - -int -amigaos_restore_a4 (void) -{ - return (flag_pic >= 3 && - (TARGET_RESTORE_A4 || TARGET_ALWAYS_RESTORE_A4 - || lookup_attribute ("saveds", - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl))))); -} - -void -amigaos_alternate_pic_setup (FILE *stream) -{ - if (TARGET_RESTORE_A4 || TARGET_ALWAYS_RESTORE_A4) - asm_fprintf (stream, "\tjbsr %U__restore_a4\n"); - else if (lookup_attribute ("saveds", - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) - asm_fprintf (stream, "\tlea %U__a4_init,%Ra4\n"); -} - -/* Attributes support. */ - -#define AMIGA_CHIP_SECTION_NAME ".datachip" - -/* Handle a "chip" attribute; - arguments as in struct attribute_spec.handler. */ - -tree -amigaos_handle_decl_attribute (tree *node, tree name, - tree args ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED, - bool *no_add_attrs) -{ - if (TREE_CODE (*node) == VAR_DECL) - { - if (is_attribute_p ("chip", name)) -#ifdef TARGET_ASM_NAMED_SECTION - { - if (! TREE_STATIC (*node) && ! DECL_EXTERNAL (*node)) - error ("`chip' attribute cannot be specified for local variables"); - else - { - /* The decl may have already been given a section attribute from - a previous declaration. Ensure they match. */ - if (DECL_SECTION_NAME (*node) == NULL_TREE) - DECL_SECTION_NAME (*node) = - build_string (strlen (AMIGA_CHIP_SECTION_NAME) + 1, - AMIGA_CHIP_SECTION_NAME); - else if (strcmp (TREE_STRING_POINTER (DECL_SECTION_NAME (*node)), - AMIGA_CHIP_SECTION_NAME) != 0) - { - error_with_decl (*node, - "`chip' for `%s' conflicts with previous declaration"); - } - } - } -#else - error ("`chip' attribute is not supported for this target"); -#endif - } - else - { - warning ("`%s' attribute only applies to variables", - IDENTIFIER_POINTER (name)); - *no_add_attrs = true; - } - - return NULL_TREE; -} - -/* Handle a "stackext", "interrupt" or "saveds" attribute; - arguments as in struct attribute_spec.handler. */ - -tree -amigaos_handle_type_attribute (tree *node, tree name, - tree args ATTRIBUTE_UNUSED, - int flags ATTRIBUTE_UNUSED, - bool *no_add_attrs) -{ - if (TREE_CODE (*node) == FUNCTION_TYPE || TREE_CODE (*node) == METHOD_TYPE) - { - if (is_attribute_p ("stackext", name)) - { - if (lookup_attribute ("interrupt", TYPE_ATTRIBUTES(*node))) - { - error ("`stackext' and `interrupt' are mutually exclusive"); - } - } - else if (is_attribute_p ("interrupt", name)) - { - if (lookup_attribute ("stackext", TYPE_ATTRIBUTES(*node))) - { - error ("`stackext' and `interrupt' are mutually exclusive"); - } - } - else if (is_attribute_p ("saveds", name)) - { - } - } - else - { - warning ("`%s' attribute only applies to functions", - IDENTIFIER_POINTER (name)); - *no_add_attrs = true; - } - - return NULL_TREE; -} - -/* Stack checking and automatic extension support. */ - -void -amigaos_prologue_begin_hook (FILE *stream, int fsize) -{ - if (TARGET_STACKCHECK) - { - if (fsize < 256) - asm_fprintf (stream, "\tcmpl %s,%Rsp\n" - "\tjcc 0f\n" - "\tjra %U__stkovf\n" - "\t0:\n", - (flag_pic == 3 ? "a4@(___stk_limit:W)" : - (flag_pic == 4 ? "a4@(___stk_limit:L)" : - "___stk_limit"))); - else - asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__stkchk_d0\n", - fsize); - } -} - -void -amigaos_alternate_frame_setup_f (FILE *stream, int fsize) -{ - if (fsize < 128) - asm_fprintf (stream, "\tcmpl %s,%Rsp\n" - "\tjcc 0f\n" - "\tmoveq %I%d,%Rd0\n" - "\tmoveq %I0,%Rd1\n" - "\tjbsr %U__stkext_f\n" - "0:\tlink %Ra5,%I%d:W\n", - (flag_pic == 3 ? "a4@(___stk_limit:W)" : - (flag_pic == 4 ? "a4@(___stk_limit:L)" : - "___stk_limit")), - fsize, -fsize); - else - asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__link_a5_d0_f\n", - fsize); -} - -void -amigaos_alternate_frame_setup (FILE *stream, int fsize) -{ - if (!fsize) - asm_fprintf (stream, "\tcmpl %s,%Rsp\n" - "\tjcc 0f\n" - "\tmoveq %I0,%Rd0\n" - "\tmoveq %I0,%Rd1\n" - "\tjbsr %U__stkext_f\n" - "0:\n", - (flag_pic == 3 ? "a4@(___stk_limit:W)" : - (flag_pic == 4 ? "a4@(___stk_limit:L)" : - "___stk_limit"))); - else if (fsize < 128) - asm_fprintf (stream, "\tcmpl %s,%Rsp\n" - "\tjcc 0f\n" - "\tmoveq %I%d,%Rd0\n" - "\tmoveq %I0,%Rd1\n" - "\tjbsr %U__stkext_f\n" - "0:\taddw %I%d,%Rsp\n", - (flag_pic == 3 ? "a4@(___stk_limit:W)" : - (flag_pic == 4 ? "a4@(___stk_limit:L)" : - "___stk_limit")), - fsize, -fsize); - else - asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__sub_d0_sp_f\n", - fsize); -} - -static rtx -gen_stack_management_call (rtx stack_pointer, rtx arg, const char *func) -{ - rtx call_insn, call, seq, name; - start_sequence (); - - /* Move arg to d0. */ - emit_move_insn (gen_rtx_REG (SImode, 0), arg); - - /* Generate the function reference. */ - name = gen_rtx_SYMBOL_REF (Pmode, func); - SYMBOL_REF_FLAG (name) = 1; - /* If optimizing, put it in a psedo so that several loads can be merged - into one. */ - if (optimize && ! flag_no_function_cse) - name = copy_to_reg (name); - - /* Generate the function call. */ - call = gen_rtx_CALL (VOIDmode, gen_rtx_MEM (FUNCTION_MODE, name), - const0_rtx); - /* If we are doing stack extension, notify about the sp change. */ - if (stack_pointer) - call = gen_rtx_SET (VOIDmode, stack_pointer, call); - - /* Generate the call instruction. */ - call_insn = emit_call_insn (call); - /* Stack extension does not change memory in an unpredictable way. */ - CONST_OR_PURE_CALL_P (call_insn) = 1; - /* We pass an argument in d0. */ - CALL_INSN_FUNCTION_USAGE (call_insn) = gen_rtx_EXPR_LIST (VOIDmode, - gen_rtx_USE (VOIDmode, gen_rtx_REG (SImode, 0)), 0); - - seq = get_insns (); - end_sequence (); - return seq; -} - -rtx -gen_stack_cleanup_call (rtx stack_pointer, rtx sa) -{ - return gen_stack_management_call (stack_pointer, sa, "__move_d0_sp"); -} - -void -amigaos_alternate_allocate_stack (rtx *operands) -{ - if (TARGET_STACKEXTEND) - emit_insn (gen_stack_management_call (stack_pointer_rtx, operands[1], - "__sub_d0_sp")); - else - { - if (TARGET_STACKCHECK) - emit_insn (gen_stack_management_call (0, operands[1], "__stkchk_d0")); - anti_adjust_stack (operands[1]); - } - emit_move_insn (operands[0], virtual_stack_dynamic_rtx); -} - -/* begin-GG-local: explicit register specification for parameters */ - -/* Initialize a variable CUM of type CUMULATIVE_ARGS - for a call to a function whose data type is FNTYPE. - For a library call, FNTYPE is 0. */ - -void -amigaos_init_cumulative_args(CUMULATIVE_ARGS *cum, tree fntype) -{ - m68k_init_cumulative_args(cum, fntype); - - if (fntype) - cum->formal_type=TYPE_ARG_TYPES(fntype); - else /* Call to compiler-support function. */ - cum->formal_type=0; -} - -/* Update the data in CUM to advance over an argument. */ - -void -amigaos_function_arg_advance(CUMULATIVE_ARGS *cum) -{ - m68k_function_arg_advance(cum); - - if (cum->formal_type) - cum->formal_type=TREE_CHAIN((tree)cum->formal_type); -} - -/* A C expression that controls whether a function argument is passed - in a register, and which register. */ - -struct rtx_def * -amigaos_function_arg(CUMULATIVE_ARGS *cum, enum machine_mode mode, tree type) -{ - tree asmtree; - if (cum->formal_type && TREE_VALUE((tree)cum->formal_type) - && (asmtree=lookup_attribute("asm", - TYPE_ATTRIBUTES(TREE_VALUE((tree)cum->formal_type))))) - { - int i; -#if 0 - /* See c-decl.c/push_parm_decl for an explanation why this doesn't work. - */ - cum->last_arg_reg=TREE_INT_CST_LOW(TREE_VALUE(TREE_VALUE(asmtree))); -#else - cum->last_arg_reg=TREE_INT_CST_LOW(TREE_VALUE(asmtree)); -#endif - cum->last_arg_len=HARD_REGNO_NREGS(cum->last_arg_reg, mode); - - for (i=0; i<cum->last_arg_len; i++) - if (cum->regs_already_used & (1 << cum->last_arg_reg+i)) - { - error("two parameters allocated for one register"); - break; - } - return gen_rtx_REG (mode, cum->last_arg_reg); - } - else - return m68k_function_arg(cum, mode, type); -} - -/* Return zero if the attributes on TYPE1 and TYPE2 are incompatible, - one if they are compatible, and two if they are nearly compatible - (which causes a warning to be generated). */ - -int -amigaos_comp_type_attributes (tree type1, tree type2) -{ - /* Functions or methods are incompatible if they specify mutually exclusive - ways of passing arguments. */ - if (TREE_CODE(type1)==FUNCTION_TYPE || TREE_CODE(type1)==METHOD_TYPE) - { - tree arg1, arg2; - arg1=TYPE_ARG_TYPES(type1); - arg2=TYPE_ARG_TYPES(type2); - for (; arg1 && arg2; arg1=TREE_CHAIN(arg1), arg2=TREE_CHAIN(arg2)) - if (TREE_VALUE(arg1) && TREE_VALUE(arg2)) - { - tree asm1, asm2; - asm1=lookup_attribute("asm", TYPE_ATTRIBUTES(TREE_VALUE(arg1))); - asm2=lookup_attribute("asm", TYPE_ATTRIBUTES(TREE_VALUE(arg2))); - if (asm1 && asm2) - { - if (TREE_INT_CST_LOW(TREE_VALUE(asm1))!= - TREE_INT_CST_LOW(TREE_VALUE(asm2))) - return 0; /* Two different registers specified. */ - } - else - if (asm1 || asm2) - return 0; /* "asm" used in only one type. */ - } - } - return 1; -} - -/* end-GG-local */ diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.h b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.h deleted file mode 100644 index b1e2660..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/amigaos.h +++ /dev/null @@ -1,553 +0,0 @@ -/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 - Free Software Foundation, Inc. - Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). - Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - - -/* Specs, switches. */ - -/* amiga/amigaos are the new "standard" defines for the Amiga. - MCH_AMIGA, AMIGA, __chip etc. are used in other compilers and are - provided for compatibility reasons. - When creating shared libraries, use different 'errno'. */ - -#undef TARGET_OS_CPP_BUILTINS -#define TARGET_OS_CPP_BUILTINS() \ - do \ - { \ - builtin_define ("__chip=__attribute__((__chip__))"); \ - builtin_define ("__saveds=__attribute__((__saveds__))"); \ - builtin_define ("__interrupt=__attribute__((__interrupt__))"); \ - builtin_define ("__stackext=__attribute__((__stackext__))"); \ - builtin_define ("__regargs=__attribute__((__regparm__))"); \ - builtin_define ("__stdargs=__attribute__((__stkparm__))"); \ - builtin_define ("__aligned=__attribute__((__aligned__(4)))"); \ - if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - builtin_define ("errno=(*ixemul_errno)"); \ - builtin_define_std ("amiga"); \ - builtin_define_std ("amigaos"); \ - builtin_define_std ("AMIGA"); \ - builtin_define_std ("MCH_AMIGA"); \ - builtin_assert ("system=amigaos"); \ - } \ - while (0) - -/* Inform the program which CPU we compile for. */ - -#undef TARGET_CPU_CPP_BUILTINS -#define TARGET_CPU_CPP_BUILTINS() \ - do \ - { \ - if (TARGET_68040_ONLY) \ - { \ - if (TARGET_68060) \ - builtin_define_std ("mc68060"); \ - else \ - builtin_define_std ("mc68040"); \ - } \ - else if (TARGET_68030 && !TARGET_68040) \ - builtin_define_std ("mc68030"); \ - else if (TARGET_68020) \ - builtin_define_std ("mc68020"); \ - builtin_define_std ("mc68000"); \ - if (flag_pic > 2) \ - { \ - builtin_define ("__pic__"); \ - if (flag_pic > 3) \ - builtin_define ("__PIC__"); \ - } \ - builtin_assert ("cpu=m68k"); \ - builtin_assert ("machine=m68k"); \ - } \ - while (0) - -/* Define __HAVE_68881__ in preprocessor according to the -m flags. - This will control the use of inline 68881 insns in certain macros. - Note: it should be set in TARGET_CPU_CPP_BUILTINS but TARGET_68881 - isn't the same -m68881 since its also true for -m680[46]0 ... - Differentiate between libnix and ixemul. */ - -#define CPP_SPEC \ - "%{m68881:-D__HAVE_68881__} " \ - "%{noixemul:%{!ansi:%{!std=*:-Dlibnix}%{std=gnu*:-Dlibnix}} -D__libnix -D__libnix__} " \ - "%{!noixemul:%{!ansi:%{!std=*:-Dixemul}%{std=gnu*:-Dixemul}} -D__ixemul -D__ixemul__}" - -/* Translate '-resident' to '-fbaserel' (they differ in linking stage only). - Don't put function addresses in registers for PC-relative code. */ - -#define CC1_SPEC \ - "%{resident:-fbaserel} " \ - "%{resident32:-fbaserel32} " \ - "%{msmall-code:-fno-function-cse}" - -/* Various -m flags require special flags to the assembler. */ - -#define ASM_SPEC \ - "%(asm_cpu) %(asm_cpu_default) %{msmall-code:-sc}" - -#define ASM_CPU_SPEC \ - "%{m68000|mc68000:-m68010} " \ - "%{m6802*|mc68020:-m68020} " \ - "%{m68030} " \ - "%{m68040} " \ - "%{m68060}" - -#define ASM_CPU_DEFAULT_SPEC \ - "%{!m680*:%{!mc680*:-m68010}}" - -/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD - compatible debug hunk. - Also, pass appropriate linker flavours depending on user-supplied - commandline options. */ - -#define LINK_SPEC \ - "%{noixemul:-fl libnix} " \ - "%{resident*:-amiga-datadata-reloc} " \ - "%{resident|fbaserel:-m amiga_bss -fl libb} " \ - "%{resident32|fbaserel32:-m amiga_bss -fl libb32} " \ - "%{g:-amiga-debug-hunk} " \ - "%(link_cpu)" - -#define LINK_CPU_SPEC \ - "%{m6802*|mc68020|m68030|m68040|m68060:-fl libm020} " \ - "%{m68881:-fl libm881}" - -/* Choose the right startup file, depending on whether we use base relative - code, base relative code with automatic relocation (-resident), their - 32-bit versions, libnix, profiling or plain crt0.o. */ - -#define STARTFILE_SPEC \ - "%{!noixemul:" \ - "%{fbaserel:%{!resident:bcrt0.o%s}}" \ - "%{resident:rcrt0.o%s}" \ - "%{fbaserel32:%{!resident32:lcrt0.o%s}}" \ - "%{resident32:scrt0.o%s}" \ - "%{!resident:%{!fbaserel:%{!resident32:%{!fbaserel32:" \ - "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}}}}" \ - "%{noixemul:" \ - "%{resident:libnix/nrcrt0.o%s} " \ - "%{!resident:%{fbaserel:libnix/nbcrt0.o%s}%{!fbaserel:libnix/ncrt0.o%s}}}" - -#define ENDFILE_SPEC \ - "%{noixemul:-lstubs}" - -/* Automatically search libamiga.a for AmigaOS specific functions. Note - that we first search the standard C library to resolve as much as - possible from there, since it has names that are duplicated in libamiga.a - which we *don't* want from there. Then search libamiga.a for any calls - that were not generated inline, and finally search the standard C library - again to resolve any references that libamiga.a might have generated. - This may only be a temporary solution since it might be better to simply - remove the things from libamiga.a that should be pulled in from libc.a - instead, which would eliminate the first reference to libc.a. Note that - if we don't search it automatically, it is very easy for the user to try - to put in a -lamiga himself and get it in the wrong place, so that (for - example) calls like sprintf come from -lamiga rather than -lc. */ - -#define LIB_SPEC \ - "%{!noixemul:" \ - "%{p|pg:-lc_p}" \ - "%{!p:%{!pg:-lc -lamiga -lc}}}" \ - "%{noixemul:" \ - "-lnixmain -lnix -lamiga %{mstackcheck|mstackextend:-lstack}}" - -/* This macro defines names of additional specifications to put in the specs - that can be used in various specifications like CC1_SPEC. Its definition - is an initializer with a subgrouping for each command option. - - Each subgrouping contains a string constant, that defines the - specification name, and a string constant that used by the GCC driver - program. - - Do not define this macro if it does not need to do anything. */ - -#define EXTRA_SPECS \ - { "asm_cpu", ASM_CPU_SPEC }, \ - { "asm_cpu_default", ASM_CPU_DEFAULT_SPEC }, \ - { "link_cpu", LINK_CPU_SPEC } - -/* Compile with stack extension. */ - -#define MASK_STACKEXTEND 0x40000000 /* 1 << 30 */ -#define TARGET_STACKEXTEND (((target_flags & MASK_STACKEXTEND) \ - && !lookup_attribute ("interrupt", \ - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) \ - || lookup_attribute ("stackext", \ - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) - -/* Compile with stack checking. */ - -#define MASK_STACKCHECK 0x20000000 /* 1 << 29 */ -#define TARGET_STACKCHECK ((target_flags & MASK_STACKCHECK) \ - && !(target_flags & MASK_STACKEXTEND) \ - && !lookup_attribute ("interrupt", \ - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl))) \ - && !lookup_attribute ("stackext", \ - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) - -/* Compile with a4 restoring in public functions. */ - -#define MASK_RESTORE_A4 0x10000000 /* 1 << 28 */ -#define TARGET_RESTORE_A4 \ - ((target_flags & MASK_RESTORE_A4) && TREE_PUBLIC (current_function_decl)) - -/* Compile with a4 restoring in all functions. */ - -#define MASK_ALWAYS_RESTORE_A4 0x8000000 /* 1 << 27 */ -#define TARGET_ALWAYS_RESTORE_A4 (target_flags & MASK_ALWAYS_RESTORE_A4) - -/* Provide a dummy entry for the '-msmall-code' switch. This is used by - the assembler and '*_SPEC'. */ - -#undef SUBTARGET_SWITCHES -#define SUBTARGET_SWITCHES \ - { "small-code", 0, \ - "" /* Undocumented. */ }, \ - { "stackcheck", MASK_STACKCHECK, \ - N_("Generate stack-check code") }, \ - { "no-stackcheck", - MASK_STACKCHECK, \ - N_("Do not generate stack-check code") }, \ - { "stackextend", MASK_STACKEXTEND, \ - N_("Generate stack-extension code") }, \ - { "no-stackextend", - MASK_STACKEXTEND, \ - N_("Do not generate stack-extension code") }, \ - { "fixedstack", - (MASK_STACKCHECK|MASK_STACKEXTEND), \ - N_("Do not generate stack-check/stack-extension code") }, \ - { "restore-a4", MASK_RESTORE_A4, \ - N_("Restore a4 in public functions") }, \ - { "no-restore-a4", - MASK_RESTORE_A4, \ - N_("Do not restore a4 in public functions") }, \ - { "always-restore-a4", MASK_ALWAYS_RESTORE_A4, \ - N_("Restore a4 in all functions") }, \ - { "no-always-restore-a4", - MASK_ALWAYS_RESTORE_A4, \ - N_("Do not restore a4 in all functions") }, - -#undef SUBTARGET_OVERRIDE_OPTIONS -#define SUBTARGET_OVERRIDE_OPTIONS \ -do \ - { \ - if (!TARGET_68020 && flag_pic==4) \ - error ("-fbaserel32 is not supported on the 68000 or 68010\n"); \ - } \ -while (0) - -/* Various ABI issues. */ - -/* This is (almost;-) BSD, so it wants DBX format. */ - -#define DBX_DEBUGGING_INFO - -/* GDB goes mad if it sees the function end marker. */ - -#define NO_DBX_FUNCTION_END 1 - -/* Allow folding division by zero. */ - -#define REAL_INFINITY - -/* Don't try using XFmode since we don't have appropriate runtime software - support. */ -#undef LONG_DOUBLE_TYPE_SIZE -#define LONG_DOUBLE_TYPE_SIZE 64 - -/* Use A5 as framepointer instead of A6, since the AmigaOS ABI requires A6 - to be used as a shared library base pointer in direct library calls. */ - -#undef FRAME_POINTER_REGNUM -#define FRAME_POINTER_REGNUM 13 - -/* We use A4 for the PIC pointer, not A5, which is the framepointer. */ - -#undef PIC_OFFSET_TABLE_REGNUM -#define PIC_OFFSET_TABLE_REGNUM (flag_pic ? 12 : INVALID_REGNUM) - -/* The AmigaOS ABI does not define how structures should be returned, so, - contrary to 'm68k.h', we prefer a multithread-safe solution. */ - -#undef PCC_STATIC_STRUCT_RETURN - -/* Setup a default shell return value for those (gazillion..) programs that - (inspite of ANSI-C) declare main() to be void (or even VOID...) and thus - cause the shell to randomly caugh upon executing such programs (contrary - to Unix, AmigaOS scripts are terminated with an error if a program returns - with an error code above the `error' or even `failure' level - (which is configurable with the FAILAT command)). */ - -#define DEFAULT_MAIN_RETURN c_expand_return (integer_zero_node) - -#undef WCHAR_TYPE -#define WCHAR_TYPE "unsigned int" - -/* XXX: section support */ -#if 0 -/* Support sections in chip memory, currently '.datachip' only. */ -#undef TARGET_ASM_NAMED_SECTION -#define TARGET_ASM_NAMED_SECTION amiga_named_section - -/* We define TARGET_ASM_NAMED_SECTION, but we don't support arbitrary sections, - including '.gcc_except_table', so we emulate the standard behaviour. */ -#undef TARGET_ASM_EXCEPTION_SECTION -#define TARGET_ASM_EXCEPTION_SECTION amiga_exception_section - -#undef TARGET_ASM_EH_FRAME_SECTION -#define TARGET_ASM_EH_FRAME_SECTION amiga_eh_frame_section -#endif - -/* Use sjlj exceptions until problems with DWARF2 unwind info on a.out - targets using GNU ld are fixed. */ -/* -#define DWARF2_UNWIND_INFO 0 -*/ -#define NO_DWARF2_UNWIND_INFO - -/* GAS supports alignment up to 32768 bytes. */ -#undef ASM_OUTPUT_ALIGN -#define ASM_OUTPUT_ALIGN(FILE, LOG) \ -do \ - { \ - if ((LOG) == 1) \ - fprintf ((FILE), "\t.even\n"); \ - else \ - fprintf ((FILE), "\t.align %d\n", (LOG)); \ - } \ -while (0) - -#define MAX_OFILE_ALIGNMENT ((1 << 15)*BITS_PER_UNIT) - -/* Call __flush_cache() after building the trampoline: it will call - an appropriate OS cache-clearing routine. */ - -#undef FINALIZE_TRAMPOLINE -#define FINALIZE_TRAMPOLINE(TRAMP) \ - emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__flush_cache"), \ - 0, VOIDmode, 2, (TRAMP), Pmode, \ - GEN_INT (TRAMPOLINE_SIZE), SImode) - -/* Baserel support. */ - -/* Given that symbolic_operand(X), return TRUE if no special - base relative relocation is necessary */ - -#define LEGITIMATE_BASEREL_OPERAND_P(X) \ - (flag_pic >= 3 && read_only_operand (X)) - -#undef LEGITIMATE_PIC_OPERAND_P -#define LEGITIMATE_PIC_OPERAND_P(X) \ - (! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X)) - -/* Define this macro if references to a symbol must be treated - differently depending on something about the variable or - function named by the symbol (such as what section it is in). - - The macro definition, if any, is executed immediately after the - rtl for DECL or other node is created. - The value of the rtl will be a `mem' whose address is a - `symbol_ref'. - - The usual thing for this macro to do is to a flag in the - `symbol_ref' (such as `SYMBOL_REF_FLAG') or to store a modified - name string in the `symbol_ref' (if one bit is not enough - information). - - On the Amiga we use this to indicate if references to a symbol should be - absolute or base relative. */ - -#undef TARGET_ENCODE_SECTION_INFO -#define TARGET_ENCODE_SECTION_INFO amigaos_encode_section_info - -#define LIBCALL_ENCODE_SECTION_INFO(FUN) \ -do \ - { \ - if (flag_pic >= 3) \ - SYMBOL_REF_FLAG (FUN) = 1; \ - } \ -while (0) - -/* Select and switch to a section for EXP. */ - -#undef TARGET_ASM_SELECT_SECTION -#define TARGET_ASM_SELECT_SECTION amigaos_select_section - -/* Preserve A4 for baserel code if necessary. */ - -#define EXTRA_SAVE_REG(REGNO) \ -do { \ - if (flag_pic && flag_pic >= 3 && REGNO == PIC_OFFSET_TABLE_REGNUM \ - && amigaos_restore_a4()) \ - return true; \ -} while (0) - -/* Predicate for ALTERNATE_PIC_SETUP. */ - -#define HAVE_ALTERNATE_PIC_SETUP (flag_pic >= 3) - -/* Make a4 point at data hunk. */ - -#define ALTERNATE_PIC_SETUP(STREAM) \ - (amigaos_alternate_pic_setup (STREAM)) - -/* Attribute support. */ - -/* Generate the test of d0 before return to set cc register in 'interrupt' - function. */ - -#define EPILOGUE_END_HOOK(STREAM) \ -do \ - { \ - if (lookup_attribute ("interrupt", \ - TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) \ - asm_fprintf ((STREAM), "\ttstl %Rd0\n"); \ - } \ -while (0) - -/* begin-GG-local: explicit register specification for parameters */ - -/* Note: this is an extension of m68k_args */ -struct amigaos_args -{ - int num_of_regs; - long regs_already_used; - int last_arg_reg; - int last_arg_len; - void *formal_type; /* New field: formal type of the current argument. */ -}; - -/* A C type for declaring a variable that is used as the first - argument of `FUNCTION_ARG' and other related values. */ - -#undef CUMULATIVE_ARGS -#define CUMULATIVE_ARGS struct amigaos_args - -/* Initialize a variable CUM of type CUMULATIVE_ARGS - for a call to a function whose data type is FNTYPE. - For a library call, FNTYPE is 0. */ - -#undef INIT_CUMULATIVE_ARGS -#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \ - (amigaos_init_cumulative_args(&(CUM), (FNTYPE))) - -/* Update the data in CUM to advance over an argument - of mode MODE and data type TYPE. - (TYPE is null for libcalls where that information may not be available.) */ - -#undef FUNCTION_ARG_ADVANCE -#define FUNCTION_ARG_ADVANCE(CUM, MODE, TYPE, NAMED) \ - (amigaos_function_arg_advance (&(CUM))) - -/* A C expression that controls whether a function argument is passed - in a register, and which register. */ - -#undef FUNCTION_ARG -#define FUNCTION_ARG(CUM, MODE, TYPE, NAMED) \ - (amigaos_function_arg (&(CUM), (MODE), (TYPE))) - -/* end-GG-local */ - -/* Stack checking and automatic extension support. */ - -#define PROLOGUE_BEGIN_HOOK(STREAM, FSIZE) \ - (amigaos_prologue_begin_hook ((STREAM), (FSIZE))) - -#define HAVE_ALTERNATE_FRAME_SETUP_F(FSIZE) TARGET_STACKEXTEND - -#define ALTERNATE_FRAME_SETUP_F(STREAM, FSIZE) \ - (amigaos_alternate_frame_setup_f ((STREAM), (FSIZE))) - -#define HAVE_ALTERNATE_FRAME_SETUP(FSIZE) TARGET_STACKEXTEND - -#define ALTERNATE_FRAME_SETUP(STREAM, FSIZE) \ - (amigaos_alternate_frame_setup ((STREAM), (FSIZE))) - -#define HAVE_ALTERNATE_FRAME_DESTR_F(FSIZE) \ - (TARGET_STACKEXTEND && current_function_calls_alloca) - -#define ALTERNATE_FRAME_DESTR_F(STREAM, FSIZE) \ - (asm_fprintf ((STREAM), "\tjra %U__unlk_a5_rts\n")) - -#define HAVE_ALTERNATE_RETURN \ - (TARGET_STACKEXTEND && frame_pointer_needed && \ - current_function_calls_alloca) - -#define ALTERNATE_RETURN(STREAM) - -#define HAVE_restore_stack_nonlocal TARGET_STACKEXTEND -#define gen_restore_stack_nonlocal gen_stack_cleanup_call - -#define HAVE_restore_stack_function TARGET_STACKEXTEND -#define gen_restore_stack_function gen_stack_cleanup_call - -#define HAVE_restore_stack_block TARGET_STACKEXTEND -#define gen_restore_stack_block gen_stack_cleanup_call - -#undef TARGET_ALTERNATE_ALLOCATE_STACK -#define TARGET_ALTERNATE_ALLOCATE_STACK 1 - -#define ALTERNATE_ALLOCATE_STACK(OPERANDS) \ -do \ - { \ - amigaos_alternate_allocate_stack (OPERANDS); \ - DONE; \ - } \ -while (0) - -/* begin-GG-local: dynamic libraries */ - -extern int amigaos_do_collecting (void); -extern void amigaos_gccopts_hook (const char *); -extern void amigaos_libname_hook (const char* arg); -extern void amigaos_collect2_cleanup (void); -extern void amigaos_prelink_hook (const char **, int *); -extern void amigaos_postlink_hook (const char *); - -/* This macro is used to check if all collect2 facilities should be used. - We need a few special ones, like stripping after linking. */ - -#define DO_COLLECTING (do_collecting || amigaos_do_collecting()) - -/* This macro is called in collect2 for every GCC argument name. - ARG is a part of commandline (without '\0' at the end). */ - -#define COLLECT2_GCC_OPTIONS_HOOK(ARG) amigaos_gccopts_hook(ARG) - -/* This macro is called in collect2 for every ld's "-l" or "*.o" or "*.a" - argument. ARG is a complete argument, with '\0' at the end. */ - -#define COLLECT2_LIBNAME_HOOK(ARG) amigaos_libname_hook(ARG) - -/* This macro is called at collect2 exit, to clean everything up. */ - -#define COLLECT2_EXTRA_CLEANUP amigaos_collect2_cleanup - -/* This macro is called just before the first linker invocation. - LD1_ARGV is "char** argv", which will be passed to "ld". STRIP is an - *address* of "strip_flag" variable. */ - -#define COLLECT2_PRELINK_HOOK(LD1_ARGV, STRIP) \ -amigaos_prelink_hook((const char **)(LD1_ARGV), (STRIP)) - -/* This macro is called just after the first linker invocation, in place of - "nm" and "ldd". OUTPUT_FILE is the executable's filename. */ - -#define COLLECT2_POSTLINK_HOOK(OUTPUT_FILE) amigaos_postlink_hook(OUTPUT_FILE) -/* end-GG-local */ - -/* Don't use any specific register allocation order. */ -#undef REG_ALLOC_ORDER diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/host-amigaos.c b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/host-amigaos.c deleted file mode 100644 index aec68d0..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/host-amigaos.c +++ /dev/null @@ -1,42 +0,0 @@ -/* AmigaOS/m68k host-specific hook definitions. - Copyright (C) 2003 Free Software Foundation, Inc. - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify it under -the terms of the GNU General Public License as published by the Free -Software Foundation; either version 2, or (at your option) any later -version. - -GCC is distributed in the hope that it will be useful, but WITHOUT ANY -WARRANTY; without even the implied warranty of MERCHANTABILITY or -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to the Free -Software Foundation, 59 Temple Place - Suite 330, Boston, MA -02111-1307, USA. */ - - -#include "config.h" -#include "system.h" -#include "coretypes.h" -#include "hosthooks.h" -#include "hosthooks-def.h" -#include "toplev.h" - -static void * amigaos_m68k_gt_pch_get_address (size_t); - -/* Return the address of the PCH address space, if the PCH will fit in it. */ - -static void * -amigaos_m68k_gt_pch_get_address (size_t sz ATTRIBUTE_UNUSED) -{ - fatal_error ("PCH not supported\n"); -} - -#undef HOST_HOOKS_GT_PCH_GET_ADDRESS -#define HOST_HOOKS_GT_PCH_GET_ADDRESS amigaos_m68k_gt_pch_get_address - -const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/t-amigaos b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/t-amigaos deleted file mode 100644 index 085de81..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/t-amigaos +++ /dev/null @@ -1,30 +0,0 @@ -# Makefile fragment for AmigaOS target. - -# Extra object file linked to the cc1* executables. -amigaos.o: $(srcdir)/config/m68k/amigaos.c $(CONFIG_H) - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) - -# Additional target dependent options for compiling libgcc.a. This just -# ensures that we don't compile libgcc* with anything other than a -# fixed stack. - -TARGET_LIBGCC2_CFLAGS = -mfixedstack - -# Support for building multiple version of libgcc. - -LIBGCC_MULTI = .; \ - libb;@fbaserel \ - libm020;@m68020 \ - libb/libm020;@fbaserel@m68020 \ - libb32/libm020;@fbaserel32@m68020 - -### begin-GG-local: dynamic libraries -# Extra objects that get compiled and linked to collect2 - -EXTRA_COLLECT2_OBJS = amigacollect2.o - -# Build supplimentary AmigaOS target support file for collect2 -amigacollect2.o: amigacollect2.c - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - -DA2IXDIR_PREFIX=\"$(prefix)/share/a2ixlibrary\" $< $(OUTPUT_OPTION) -### end-GG-local diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/x-amigaos b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/x-amigaos deleted file mode 100644 index 4409fc5..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/x-amigaos +++ /dev/null @@ -1,104 +0,0 @@ -# Makefile fragment for AmigaOS host - -# Each compilation environment (Manx, Dice, GCC, SAS/C, etc) provides its -# own equivalent of the UNIX /usr/include tree. For gcc, the standard headers -# are in /gg/include and system specific headers are in /gg/os-include. -# Use these paths for fixincludes. - -SYSTEM_HEADER_DIR = $(prefix)/include - -# Uncomment the following macro to get a resident GCC. We don't do it -# by default, since we want to support users with mc68000. -# WARNING! If you uncomment this, you MUST add the same flags to the -# libiberty's Makefile (libiberty is now linked into GCC executables). - -#RESIDENT = -m68020 -resident32 - -# Additional host flags that are not used when compiling with GCC_FOR_TARGET, -# such as when compiling the libgcc* runtime archives. GCC uses stack -# a lot, and since AmigaOS provides processes with a small, fixed size -# stack, we have to generate code that will extend it whenever necessary. - -XCFLAGS = -mstackextend $(RESIDENT) - -# AmigaOS supports "AmigaGuide(R)" hypertext files. For GCC, these are -# build with a custom "makeinfo". - -# Arrange for guides to be build with GCC, in the build directory. - -### begin-GG-local: gcc-amigaos -#EXTRA_DOC_TARGETS = guide gcc-amigaos-doc -### end-GG-local - -# Actually build guides - -guide:: doc/cpp.guide doc/gcc.guide doc/gccint.guide \ - doc/gccinstall.guide doc/cppinternals.guide - -doc/cpp.guide: $(TEXI_CPP_FILES) -doc/gcc.guide: $(TEXI_GCC_FILES) -doc/gccint.guide: $(TEXI_GCCINT_FILES) -doc/cppinternals.guide: $(TEXI_CPPINT_FILES) - -doc/%.guide: %.texi - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) --amiga $(MAKEINFOFLAGS) -I $(docdir) \ - -I $(docdir)/include -o $@ $<; \ - fi - -# Duplicate entry to handle renaming of gccinstall.guide -doc/gccinstall.guide: $(TEXI_GCCINSTALL_FILES) - if [ x$(BUILD_INFO) = xinfo ]; then \ - $(MAKEINFO) --amiga $(MAKEINFOFLAGS) -I $(docdir) \ - -I $(docdir)/include -o $@ install.texi; \ - fi - -# Arrange for guides to be installed with GCC. - -### begin-GG-local: gcc-amigaos -#EXTRA_INSTALL_TARGETS = install-guide install-gcc-amigaos-doc -### end-GG-local - -# Where the guide files go - -guidedir = $(prefix)/guide - -# Actually install guides. - -installdirs-guide: - $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(guidedir) - -install-guide: doc installdirs-guide \ - $(DESTDIR)$(guidedir)/cpp.guide \ - $(DESTDIR)$(guidedir)/gcc.guide \ - $(DESTDIR)$(guidedir)/cppinternals.guide \ - $(DESTDIR)$(guidedir)/gccinstall.guide \ - $(DESTDIR)$(guidedir)/gccint.guide - -$(DESTDIR)$(guidedir)/%.guide: doc/%.guide installdirs-guide - rm -f $@ - if [ -f $< ]; then \ - for f in $(<)*; do \ - realfile=`echo $$f | sed -e 's|.*/$[^/]*$$$|\1|'`; \ - $(INSTALL_DATA) $$f $(DESTDIR)$(guidedir)/$$realfile; \ - chmod a-x $(DESTDIR)$(guidedir)/$$realfile; \ - done; \ - else true; fi - -### begin-GG-local: gcc-amigaos -# Build and install gcc-amigaos.guide - documentation specific to the -# AmigaOS port of GCC. - -gcc-amigaos-doc:: doc/gcc-amigaos.info doc/gcc-amigaos.guide - -doc/gcc-amigaos.info doc/gcc-amigaos.guide: gcc-amigaos.texi - -install-gcc-amigaos-doc: doc installdirs installdirs-guide \ - $(DESTDIR)$(infodir)/gcc-amigaos.info \ - $(DESTDIR)$(guidedir)/gcc-amigaos.guide -### end-GG-local - -host-amigaos.o : $(srcdir)/config/m68k/host-amigaos.c $(CONFIG_H) $(SYSTEM_H) \ - coretypes.h hosthooks.h hosthooks-def.h toplev.h diagnostic.h - $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ - $(srcdir)/config/m68k/host-amigaos.c diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/xm-amigaos.h b/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/xm-amigaos.h deleted file mode 100644 index 8b1a3d6..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/config/m68k/xm-amigaos.h +++ /dev/null @@ -1,64 +0,0 @@ -/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. - Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 - Free Software Foundation, Inc. - Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). - -This file is part of GCC. - -GCC is free software; you can redistribute it and/or modify -it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) -any later version. - -GCC is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with GCC; see the file COPYING. If not, write to -the Free Software Foundation, 59 Temple Place - Suite 330, -Boston, MA 02111-1307, USA. */ - -#ifndef _FCNTL_H_ -#include <fcntl.h> -#endif - -/* AmigaOS specific headers, such as from the Native Developer Update kits, - go in SYSTEM_INCLUDE_DIR. STANDARD_INCLUDE_DIR is the equivalent of - Unix "/usr/include". All other include paths are set in Makefile. */ - -#define SYSTEM_INCLUDE_DIR "/gg/os-include" -#define STANDARD_INCLUDE_DIR "/gg/include" - -#define STANDARD_EXEC_PREFIX_1 "/gg/libexec/gcc/" -#define STANDARD_EXEC_PREFIX_2 "/gg/lib/gcc/" -#define STANDARD_STARTFILE_PREFIX_1 "/gg/lib/" -#define STANDARD_STARTFILE_PREFIX_2 "/gg/lib/" - -/* The AmigaOS stores file names with regard to upper/lower case, but actions - on existing files are case independent on the standard filesystems. - - A good example of where this causes problems is the conflict between the C - include file <string.h> and the C++ include file <String.h>, where the C++ - include file dir is searched first and thus causes includes of <string.h> - to include <String.h> instead. - - In order to solve this problem we define the macro OPEN_CASE_SENSITIVE as - the name of the function that takes the same args as open() and does case - dependent opens. */ - -#define OPEN_CASE_SENSITIVE(NAME, FLAGS, MODE) open ((NAME), (FLAGS) | O_CASE, (MODE)) - -/* On the AmigaOS, there are two pathname separators, '/' (DIR_SEPARATOR) - and ':' (VOL_SEPARATOR). DIR_SEPARATOR defaults to the correct - character, so we don't have to explicitly set it. */ - -#define DIR_SEPARATOR '/' -#define VOL_SEPARATOR ':' -#define DIR_SEPARATOR_2 VOL_SEPARATOR - -/* Zap PREFIX_INCLUDE_DIR, since with the AmigaOS port it is the same as - STANDARD_INCLUDE_DIR. */ - -#undef PREFIX_INCLUDE_DIR diff --git a/m68k-unknown-amigaos/recipes/files/gcc/gcc/doc/gcc-amigaos.texi b/m68k-unknown-amigaos/recipes/files/gcc/gcc/doc/gcc-amigaos.texi deleted file mode 100644 index 481c676..0000000 --- a/m68k-unknown-amigaos/recipes/files/gcc/gcc/doc/gcc-amigaos.texi +++ /dev/null @@ -1,1116 +0,0 @@ -\input texinfo.tex @c -*-texinfo-*- -@c %**start of header -@setfilename gcc-amigaos.info -@settitle AmigaOS-only features of GCC -@set lastupdate Nov 5th, 2003 -@c %**end of header - -@ifinfo -This document describes implementation specific features of the GCC -compiler collection port for the AmigaOS. - -@copying -Copyright @copyright{} 1996, 1997 Kamil Iskra - -Permission is granted to make and distribute verbatim copies of this -manual provided the copyright notice and this permission notice are -preserved on all copies. -@end copying -@end ifinfo - -@titlepage -@sp 10 -@center @titlefont{GCC Amiga} -@subtitle Description of the AmigaOS-only features of GCC -@subtitle @value{lastupdate} -@author Kamil Iskra -@page -@end titlepage - -@ifinfo -@node Top, Introduction, (dir), (dir) -This document describes the AmigaOS-only features of the @samp{GCC} -compiler collection. - -Last updated @value{lastupdate}. -@end ifinfo - -@menu -* Introduction:: Purpose of this document. - -* Invocation:: Command line options. -* Attributes:: Variable and function attributes. -* Defines:: Preprocessor symbols. -* Miscellaneous:: Uncategorizable. - -* Index:: Concept index. -@end menu - -@node Introduction, Invocation, Top, Top -@chapter Introduction -@cindex Introduction -@cindex Purpose of this document - -This document is supposed to be an addendum to the baseline @samp{GCC} -documentation. -Note that given email addresses and urls might be obsolete! - -It focuses on the features that are visible by users and are important -to them. It is not supposed to document the internals of the AmigaOS -port of @samp{GCC}. - -It describes features implemented in the @samp{Geek Gadgets GCC} port. -For more information about @samp{Geek Gadgets}, please refer to: - -@format -http://www.geekgadgets.org/ -ftp://ftp.geekgadgets.org/pub/geekgadgets/README -@end format - -This document focuses on @samp{GCC}. It does not describe the -AmigaOS-only features of other @samp{GNU} packages, such as -@samp{binutils}, unless they are very closely connected to @samp{GCC}. - -This means, that, unless stated otherwise, when we talk about the -``compiler'', we mean the @file{gcc}, @file{cpp} and @file{cc1} -executables, i.e., the executables that convert @samp{C} source code -to assembly source code. The assembler and linker are generally beyond -the scope of this document. - -The primary source of information used to create this document was the -@samp{GCC} source code. Some parts of this document are based on: - -@itemize @bullet -@item -The @samp{LibNIX} manual, written by Matthias Fleischer and Gunther -Nikl: - -@format -fleischr@@izfm.uni-stuttgart.de -gnikl@@informatik.uni-rostock.de -@end format - -@item -The @samp{A2IXLibrary} manual, written by Hans Verkuil: - -@format -hans@@wyst.hobby.nl -@end format - -@item -The @samp{README} file, maintained by Rask Ingemann Lambertsen: - -@format -gc948374@@gbar.dtu.dk -http://www.gbar.dtu.dk/~c948374/GNU/ -@end format - -@item -The @samp{Geek Gadgets FAQ}, maintained by Lynn Winebarger: - -@format -owinebar@@indiana.edu -http://nickel.ucs.indiana.edu/~owinebar/interests/amiga/amiga.html -@end format - -@item -The @samp{FAQ for g++ and libg++}, written by Joe Buck: - -@format -jbuck@@synopsys.com -http://www.cygnus.com/misc/g++FAQ_toc.html -@end format - -@item -Discussions on the @samp{Geek Gadgets} mailing list: - -@format -gg@@geekgadgets.org -@end format -@end itemize - -This document was created by Kamil Iskra. Please email any questions, -suggestions etc. to <iskra@@student.uci.agh.edu.pl> or, even better, -to the <gg@@geekgadgets.org> mailing list. - -The author would like to thank Kriton Kyrimis <kyrimis@@cti.gr> and -Lars Hecking <lhecking@@nmrc.ucc.ie> for correcting an awful lot of -language mistakes in this document. - -@node Invocation, Attributes, Introduction, Top -@chapter Invocation -@cindex Invocation -@cindex Command line options - -The AmigaOS port of @samp{GCC} supports the following non-standard -command line options: - -@menu -* -noixemul:: Link with @samp{LibNIX}. - -* -fbaserel:: Produce @samp{a4}-relative data. -* -resident:: Produce a @samp{pure} executable. -* -fbaserel32:: Produce @samp{a4}-relative data with no size limits. -* -resident32:: Produce a @samp{pure} executable with no size limits. -* -msmall-code:: Produce @samp{PC}-relative code. - -* -mstackcheck:: Produce stack-checking code. -* -mstackextend:: Produce stack-extending code. -* -mfixedstack:: Produce plain code. - -* -mrestore-a4:: Reload @samp{a4} in public functions. -* -malways-restore-a4:: Reload @samp{a4} in all functions. - -* -mregparm:: Pass function arguments in registers. - -* -frepo:: Enable @samp{C++} Template Repository. -@end menu - -Accordingly, the AmigaOS port of @samp{GCC} supports several flavors -of linker libraries. @xref{Library flavors, Relation between library -flavors and compile-time options}. - -@node -noixemul, -fbaserel, Invocation, Invocation -@section -noixemul -@cindex -noixemul -@cindex Link with LibNIX - -@cindex IXEmul -By default, the executables created with @samp{GCC} require -(a)samp{ixemul.library} to run. This has its advantages (easy porting of -@samp{UN*X} programs, resource tracking, debugging, profiling, etc) -and disadvantages (@samp{UN*X}-style pathnames, large shared library, -etc). - -@cindex LibNIX -If @samp{-noixemul} is specified on the @samp{GCC} command line, the -executable created will not require @samp{ixemul.library} --- it will -use the static linker library @samp{LibNIX} instead. This library is -very Amiga-like and @samp{SAS/C}-like, so it is convenient for the -AmigaOS-specific development. - -@quotation -@emph{Note}: There is no great mystery about the @samp{-noixemul} -option. It has absolutely no effect on the code generated by the -compiler, only instructing the @samp{gcc} driver to pass different -options to the linker and preprocessor (@pxref{Options information}, -@pxref{Library flavors}). - -This option has no negative form. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -fbaserel, -resident, -noixemul, Invocation -@section -fbaserel -@cindex -fbaserel -@cindex Produce a4-relative data - -By default, the code generated by @samp{GCC} references data using -32-bit, absolute addressing. - -@cindex a4 -@cindex 64 KB data limit -The @samp{-fbaserel} option will make @samp{GCC} generate code that -references data with 16 bit offsets relative to the @samp{a4} address -register. This makes executables smaller and faster. Unfortunately, -the size of the data section cannot exceed 64 KB, so this option -cannot be used for large programs, like @samp{GCC} itself. - -@quotation -@emph{Note}: For a base-relative executable, @samp{-fbaserel} needs to -be specified for compiling @emph{and} linking. Base-relative programs -require special startup code and special versions of linker libraries. -Since not all linker libraries are available in both plain and base -relative versions, the usefulness of this option is limited. It is -important to note that when the base-relative library is missing, the -linker will attempt to use the plain one. This might result in strange -link-time or even run-time errors. - -@cindex -fpic -This option is the AmigaOS equivalent of the standard @samp{GCC} -option @samp{-fpic}, which is not supported by the AmigaOS port. -@samp{-fpic} generates code that references data indirectly, through a -@dfn{global offset table}. The special addressing modes available on -the @samp{m68k} processor family allow for a much more efficient -implementation with @samp{-fbaserel}. - -The negative form of @samp{-fbaserel} is @samp{-fno-baserel}, and is -on by default. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -resident, -fbaserel32, -fbaserel, Invocation -@section -resident -@cindex -resident -@cindex Produce a pure executable - -Executables produced with the @samp{-resident} option are @dfn{pure}, -so they can be made @dfn{resident} using the AmigaShell -@samp{resident} command. @samp{resident} executables are loaded to -memory just once, and several concurrent instances share the code -section. - -@quotation -@emph{Note}: The compiler generates the same code for @samp{-resident} -as for @samp{-fbaserel} (@pxref{-fbaserel}). Only the linking stage is -different (special startup code is linked). - -This option has no negative form. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -fbaserel32, -resident32, -resident, Invocation -@section -fbaserel32 -@cindex -fbaserel32 -@cindex Produce a4-relative data with no size limits - -The difference between the @samp{-fbaserel32} and @samp{-fbaserel} -options (@pxref{-fbaserel}) is the same as between the standard -@samp{GCC} options @samp{-fPIC} and @samp{-fpic}. - -Code generated with @samp{-fbaserel32} references data with 32 bit -offsets relative to the @samp{a4} address register. In contrast to the -@samp{-fbaserel} (@pxref{-fbaserel}) option, there is no 64 KB size -limit. Unfortunately, the addressing modes with 32 bit offsets are -only available on 68020 and higher processors. Therefore, it is -necessary to specify @samp{-m68020} or higher to use this option. - -@quotation -@emph{Note}: This option used to be called @samp{-flarge-baserel} -before @samp{Geek Gadgets} snapshot @samp{970109}. Since it was not -functional then, this should not cause any compatibility problems. - -The negative form of @samp{-fbaserel32} is @samp{-fno-baserel32}, and -is on by default. -@end quotation - -@node -resident32, -msmall-code, -fbaserel32, Invocation -@section -resident32 -@cindex -resident32 -@cindex Produce a pure executable with no size limits - -This option is an improved version of @samp{-resident} -(@pxref{-resident}) --- it does not impose any limits on data section -size. Unfortunately, just like @samp{-fbaserel32} -(@pxref{-fbaserel32}), it is only available for 68020 or higher -processors. Therefore, it is necessary to specify @samp{-m68020} or -higher to use this option. - -@quotation -@emph{Note}: This option was first made available in the @samp{GCC} -2.7.2.1, @samp{Geek Gadgets} snapshot @samp{970109}. - -This option has no negative form. -@end quotation - -@node -msmall-code, -mstackcheck, -resident32, Invocation -@section -msmall-code -@cindex -msmall-code -@cindex Produce PC-relative code - -By default, the code generated by the compiler references functions -using 32-bit, absolute addressing. - -@cindex 32 KB code limit -Code generated by @samp{GCC} with the @samp{-msmall-code} option -references symbols in the code section with 16 bit offsets, relative -to the @samp{PC} (@dfn{program counter}). This makes executables -smaller and faster. Unfortunately, the size of the code section is -generally limited to 32 KB, so this option can only be used for -relatively small programs. - -@quotation -@emph{Note}: Actually, the compiler always generates 32-bit code -references. If the assembler can calculate the offset between the -referencing instruction and the referenced symbol (in other words, if -the referenced symbol is in the same source file), it replaces the -32-bit reference with the @samp{PC}-relative one. External references -are left intact, unless @samp{-msmall-code} is used, in which case the -assembler generates @samp{PC}-relative references, and the exact -offsets are calculated by the linker. - -This option has no negative form. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -mstackcheck, -mstackextend, -msmall-code, Invocation -@section -mstackcheck -@cindex -mstackcheck -@cindex Produce stack-checking code - -By default, the code generated by @samp{GCC} does not check if there -is enough stack available before performing stack-consuming -operations. This is generally not necessary on @samp{UN*X} systems, -where the stack is extended automagically whenever needed. - -Unfortunately, the AmigaOS provides tasks with a static, fixed size -stack. - -However, if a program is compiled with @samp{-mstackcheck}, it will -check if there is enough stack available before performing any -stack-hungry operations. If there is a danger of stack overflow, the -program will abort and the user will be notified. - -Needless to say, stack checking increases the executable size and the -execution time. - -@quotation -@emph{Note}: Stack checking cannot be used for functions that might be -called from outside your task. This includes interrupt handlers, -shared library functions, hooks etc. In such cases, you should either -avoid using @samp{-mstackcheck} for files containing such functions, -or use @code{__attribute__((interrupt))} (@pxref{interrupt}). - -It is safe to call a function that performs stack checking from one -that does not, and vice versa. - -The negative form of @samp{-mstackcheck} is @samp{-mno-stackcheck}, -and is on by default. - -@emph{Warning}: @samp{-mno-stackcheck} used to be called -@samp{-mnostackcheck} before @samp{Geek Gadgets} snapshot -@samp{961012}. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -mstackextend, -mfixedstack, -mstackcheck, Invocation -@section -mstackextend -@cindex -mstackextend -@cindex Produce stack-extending code - -@samp{-mstackextend} is very similar to @samp{-mstackcheck} -(@pxref{-mstackcheck}). - -The main difference is that when a program runs out of stack, it is -not aborted, but a new stack area is allocated and the program -continues to run. - -@quotation -@emph{Note}: Stack extension can slow down programs significantly. It -is advised that programs are written in such a way that they do not -require too much stack. This can generally be achieved by explicitly -allocating memory for large structures and arrays using functions like -@samp{malloc()} or @samp{AllocMem()}, instead of creating them as -local variables. Another method is replacing recursion with iteration. -In addition, it might be considered to use stack extension only for -selected, ``dangerous'' functions (@pxref{stackext}), not for all -functions in a given program. - -The negative form of @samp{-mstackextend} is @samp{-mno-stackextend}, -and is on by default. - -@emph{Warning}: @samp{-mno-stackextend} used to be called -@samp{-mnostackextend} before @samp{Geek Gadgets} snapshot -@samp{961012}. -@end quotation - -For more information, please refer to the @samp{LibNIX} documentation. - -@node -mfixedstack, -mrestore-a4, -mstackextend, Invocation -@section -mfixedstack -@cindex -mfixedstack -@cindex Produce plain code - -This option makes @samp{GCC} generate plain code, that does neither -stack checking nor extension. Since this is the default, there is -generally no need to use this option. - -@quotation -@emph{Note}: This option has no negative form. -@end quotation - -@node -mrestore-a4, -malways-restore-a4, -mfixedstack, Invocation -@section -mrestore-a4 -@cindex -mrestore-a4 -@cindex Reload a4 in public functions - -This option is used to create the @samp{IXEmul} shared libraries -(those @file{*.ixlibrary} files). - -It sets @samp{a4} to the appropriate value in the prologues of all -public functions (i.e., functions with external linkage). This is -necessary if these functions are called from the code of application. - -@quotation -@emph{Note}: This option should not be used except for the creation of -an @samp{IXEmul} shared library. - -This option was first made available in the @samp{GCC} 2.7.2, -@samp{Geek Gadgets} snapshot @samp{960902}. It used to be called -@samp{-frestore-a4}, and was relabeled to its current name in the -@samp{GCC} 2.7.2.1, @samp{Geek Gadgets} snapshot @samp{961012}. - -The negative form of @samp{-mrestore-a4} is @samp{-mno-restore-a4}, -and is on by default. -@end quotation - -For more information, please refer to the @samp{A2IXLibrary} -documentation. - -@node -malways-restore-a4, -mregparm, -mrestore-a4, Invocation -@section -malways-restore-a4 -@cindex -malways-restore-a4 -@cindex Reload a4 in all functions - -This option is very similar to @samp{-mrestore-a4} -(@pxref{-mrestore-a4}). - -The only difference is that it sets @samp{a4} in all functions, -including private ones (i.e., functions with internal linkage, -@samp{static}). This is safer than @samp{-mrestore-a4} -(@pxref{-mrestore-a4}), but is also slower. - -@quotation -@emph{Note}: This option should not be used except for the creation of -an @samp{IXEmul} shared library. - -This option was first made available in the @samp{GCC} 2.7.2, -@samp{Geek Gadgets} snapshot @samp{960902}. It used to be called -@samp{-falways-restore-a4}, and was relabeled to its current name in -the @samp{GCC} 2.7.2.1, @samp{Geek Gadgets} snapshot @samp{961012}. - -The negative form of @samp{-malways-restore-a4} is -@samp{-mno-always-restore-a4}, and is on by default. -@end quotation - -For more information, please refer to the @samp{A2IXLibrary} -documentation. - -@node -mregparm, -frepo, -malways-restore-a4, Invocation -@section -mregparm -@cindex -mregparm -@cindex Pass function arguments in registers - -On the @samp{m68k} architecture, @samp{GCC} passes function arguments -on the stack by default. - -@samp{-mregparm} allows for passing arguments in registers. This can -be slightly faster than the standard method of passing arguments on -the stack. - -The full syntax of this option is: - -@format --mregparm[=<value>] -@end format - -@samp{value} should be an integer ranging from 1 to 4. If no -@samp{value} is provided, 2 will be used. - -Four types of function arguments are recognized: - -@table @samp -@item Integer -Integer numbers (this includes enumerations, small structures and -@samp{bool} in @samp{C++}, but excludes @samp{long long}, which is too -large). They are passed in data registers, starting from @samp{d0}. - -@item Pointer -Pointers to objects or functions (this includes @samp{C++} references -and the implicit @samp{this} argument). They are passed in address -registers, starting from @samp{a0}. - -@item Float -Floating point numbers. If the floating point code generation is -enabled, they are passed in floating point registers, starting from -@samp{fp0}. Otherwise, they are handled like the next type. - -@item Other -All the other types of arguments, like large structures, pointers to -class methods in @samp{C++}, etc. They are always passed on the stack. -@end table - -The value given for @samp{-mregparm} indicates how many arguments of -each of the above first three types should be passed in registers. - -Example: @samp{GCC} is invoked with @samp{-mregparm} (without any -value, so 2 will be used) to compile a source containing the function: - -@example -void fun(int a, char *str, char b, int c); -@end example - -@samp{a} and @samp{b} will be passed in @samp{d0} and @samp{d1}, -respectively, @samp{str} will be passed in @samp{a0}, and @samp{c} -will be passed on the stack. - -@quotation -@emph{Note}: To use this option properly, it is very important that -all sources are fully prototyped. There may be very serious problems -if they are not, since @samp{GCC} will have to ``guess'' where to put -arguments, potentially making a wrong decission. Example: - -@example -[in file1.c] -void f(void) -@{ - g(0); /* Call to a function with no prototype. The argument - will be put in d0, since it is an integer. */ -@} - -[in file2.c] -void g(char *a) /* The argument is expected in a0, since it is - a pointer. */ -@{ -@} -@end example - -@samp{-Wimplicit -Wstrict-prototypes} should be used to ensure that -there are no prototypes missing. - -In case of @samp{stdargs} functions, such as @samp{printf}, all -arguments are passed on the stack. - -As of this writing, @samp{-mregparm} is supported by neither -@samp{IXEmul} nor @samp{LibNIX}, so its usefulness is very limited. - -This option was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -The negative form of @samp{-mregparm} is @samp{-mno-regparm}, and is -on by default. -@end quotation - -@node -frepo, , -mregparm, Invocation -@section -frepo -@cindex -frepo -@cindex Enable C++ Template Repository - -The AmigaOS port of @samp{GCC} includes @samp{C++} @dfn{Template -Repository} patch, so-called @samp{repo} patch. - -In order to activate it, please compile @samp{C++} source files with -@samp{-frepo}. The compiler will not generate unnecessary -@samp{template} code, and will create @samp{.rpo} files that contain -information about @samp{template} symbols used in each source file. -Afterwards, during linking stage, a special tool called -@samp{collect2} will make sure that every required instantiation of -each @samp{template} is linked into the executable, recompiling some -source files if necessary. - -@quotation -@emph{Note}: This option was first made available in the @samp{GCC} -2.7.2.1, @samp{Geek Gadgets} snapshot @samp{970109}. - -This option is not specific to the AmigaOS port of -@samp{GCC}, nevertheless it is not fully supported in the baseline -sources. - -This patch has been created in Cygnus Support, a company that is a -major contributor to the @samp{GNU} project. It has not been -integrated into the baseline sources due to design disagreements. - -The negative form of @samp{-frepo} is @samp{-fno-repo}, and is on by -default. -@end quotation - -For more information, please refer to the @samp{G++ FAQ}. - -@node Attributes, Defines, Invocation, Top -@chapter Attributes -@cindex Attributes -@cindex Variable and function attributes - -The following non-standard attributes are available in the AmigaOS -port of @samp{GCC}: - -@menu -Variable attributes: -* chip:: Put object in @samp{chip} memory. - -Function attributes: -* saveds:: Reload @samp{a4}. -* interrupt:: Do not mess with the stack. -* stackext:: Generate stack extension. -* regparm:: Pass arguments in registers. -* stkparm:: Pass arguments on the stack. -@end menu - -@node chip, saveds, Attributes, Attributes -@section chip -@cindex chip -@cindex Put object in chip memory - -Amiga hardware requires some data to be located in @samp{chip} memory. - -Typically, if an initialized buffer is required (containing a picture -bitmap, for example), a plain, statically initialized buffer is used, -and the data is copied into a dynamically allocated @samp{MEMF_CHIP} -buffer. - -This is not necessary with the @samp{chip} attribute. If this -attribute is specified for an initialized, static variable, it will be -allocated in @samp{chip} memory automagically by the AmigaOS. - -A small example: - -@example -UWORD __attribute__((chip)) bitmap1[] = @{ ... @}; -@end example - -@quotation -@emph{Note}: For compatibility with other AmigaOS @samp{C} compilers, -a preprocessor symbol @samp{__chip} is available, which expands to -@code{__attribute__((chip))} (@pxref{Keyword macros}). - -All the @samp{chip} attribute does is specifying that data should go -to a section called @samp{.datachip}. Therefore, the standard -@samp{GCC} feature @code{__attribute__((section(".datachip")))} can be -used instead. - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{970328}. - -For proper operation, this attribute requires a special version of the -assembler, which generates standard AmigaOS object files. This version -is not yet available in @samp{Geek Gadgets} in binary form, since -support for this object files format is not yet complete. -@end quotation - -@format -This attribute is not supported with @samp{GCC} 3.3 or newer! -@end format - -@node saveds, interrupt, chip, Attributes -@section saveds -@cindex saveds -@cindex Reload a4 - -This attribute is ignored, unless base-relative data -(@pxref{-fbaserel}) is compiled. - -To improve speed, programs compiled with the AmigaOS port of -@samp{GCC} set the @samp{a4} register to the appropriate value only -once, in the startup code. Code generated with the standard @samp{GCC} -option @samp{-fpic}, in contrast, sets the @samp{a4} register in every -function which references global data. - -This is only safe as long as all function calls are performed from -within your own code. Things become ``tricky'' if callback functions, -like the AmigaOS hooks, interrupt handlers etc. are used. If global -data is referenced in such functions, @samp{a4} has to be set -properly. - -This is exactly what the @samp{saveds} attribute does: it initializes -@samp{a4} in the function prologue, and restores it to its original -value in the function epilogue. - -@quotation -@emph{Note}: For compatibility with other AmigaOS @samp{C} compilers, -a preprocessor symbol @samp{__saveds} is available, which expands to -@code{__attribute__((saveds))} (@pxref{Keyword macros}). - -Please do not use this attribute in pure executables -(@pxref{-resident}, @pxref{-resident32}). This is because several -invocations of pure executables can run concurrently, each one having -its own data section, and there is no way to find out to which of -these sections should @samp{a4} be set. - -The @samp{saveds} attribute is not necessary in function declarations -(prototypes). -@end quotation - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node interrupt, stackext, saveds, Attributes -@section interrupt -@cindex interrupt -@cindex Do not mess with the stack - -This attribute should be used for any kind of callback functions that -can be called from outside your task. This includes interrupt -handlers, shared library functions, etc. - -Most often, the @samp{interrupt} attribute is only necessary if a -program is compiled with stack checking or extension -(@pxref{-mstackcheck}, @pxref{-mstackextend}). It will prevent the -compiler from generating stack checking or extension code for the -function it was specified for. - -Additionally, it will set @samp{CC} (@dfn{condition codes register}) -in the function epilogue to return value, by performing @code{tstl -d0}. - -@quotation -@emph{Note}: For compatibility with other AmigaOS @samp{C} compilers, -a preprocessor symbol @samp{__interrupt} is available, which expands -to @code{__attribute__((interrupt))} (@pxref{Keyword macros}). - -The @samp{interrupt} attribute is mutually exclusive with the -@samp{stackext} attribute (@pxref{stackext}). - -This attribute is not necessary in function declarations (prototypes). -@end quotation - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node stackext, regparm, interrupt, Attributes -@section stackext -@cindex stackext -@cindex Generate stack extension - -This attribute makes @samp{GCC} generate stack extension code for the -function for which it was used (@pxref{-mstackextend}). This makes it -possible to use stack extension selectively, only for the -``dangerous'' functions --- recursive functions, functions with large -local variables, etc. - -@quotation -@emph{Note}: For compatibility with other AmigaOS @samp{C} compilers, -a preprocessor symbol @samp{__stackext} is available, which expands to -@code{__attribute__((stackext))} (@pxref{Keyword macros}). - -The @samp{stackext} attribute is mutually exclusive with the -@samp{interrupt} attribute (@pxref{interrupt}). - -This attribute is not necessary in function declarations (prototypes). -@end quotation - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node regparm, stkparm, stackext, Attributes -@section regparm -@cindex regparm -@cindex Pass arguments in registers - -The @samp{regparm} attribute, together with the @samp{stkparm} -attribute (@pxref{stkparm}), can be used to fine-tune the way -arguments are passed. It makes @samp{GCC} pass arguments in registers -for the function for which it was used, regardless of whether the -global @samp{-mregparm} option was used or not (@pxref{-mregparm}). - -An optional integer argument ranging from 1 to 4 indicates how many -arguments of each type should be passed in registers -(@pxref{-mregparm}). The syntax is the following: - -@example -void __attribute__((regparm(3))) fun(int a, char *str, char b, int c); -@end example - -This will make @samp{GCC} pass @samp{a}, @samp{b} and @samp{c} in -@samp{d0}, @samp{d1} and @samp{d2}, respectively, and @samp{str} in -@samp{a0}. - -If the argument is not provided, the value given for @samp{-mregparm} -will be used (or 2 if that option was not specified, -@pxref{-mregparm}). - -@quotation -@emph{Note}: There is generally no need to use this attribute unless -files compiled with different calling conventions are linked together. - -For compatibility with other AmigaOS @samp{C} compilers, a -preprocessor symbol @samp{__regargs} is available, which expands to -@code{__attribute__((regparm))} (@pxref{Keyword macros}). - -The @samp{regparm} attribute is mutually exclusive with the -@samp{stkparm} attribute (@pxref{stkparm}). - -This attribute is necessary both in function declarations (prototypes) -and definitions (function code). -@end quotation - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node stkparm, , regparm, Attributes -@section stkparm -@cindex stkparm -@cindex Pass arguments on the stack - -The @samp{stkparm} attribute, together with the @samp{regparm} -attribute (@pxref{regparm}), can be used to fine-tune the way -arguments are passed. It makes @samp{GCC} pass arguments on stack for -the function for which it was used, regardless of whether the global -@samp{-mregparm} option was used or not (@pxref{-mregparm}). - -@quotation -@emph{Note}: There is generally no need to use this attribute unless -files compiled with different calling conventions are linked together. - -For compatibility with other AmigaOS @samp{C} compilers, a -preprocessor symbol @samp{__stdargs} is available, which expands to -@code{__attribute__((stkparm))} (@pxref{Keyword macros}). - -The @samp{stkparm} attribute is mutually exclusive with the -@samp{regparm} attribute (@pxref{regparm}). - -This attribute is necessary both in function declarations (prototypes) -and definitions (function code). -@end quotation - -This attribute was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node Defines, Miscellaneous, Attributes, Top -@chapter Defines -@cindex Defines -@cindex Preprocessor symbols - -The AmigaOS-specific preprocessor symbols available in @samp{GCC} can -be divided into three groups: - -@menu -* Identifying machine:: What machine is this? -* Options information:: Which options have been specified? -* Keyword macros:: Compatibility with other compilers. -@end menu - -@node Identifying machine, Options information, Defines, Defines -@section Symbols identifying machine -@cindex Symbols identifying machine -@cindex What machine is this - -The following machine-identifying preprocessor symbols are available: - -@table @samp -@item mc68000 -This macro identifies the machine as having a CPU from the Motorola -68000 family. - -@item amiga -@item amigaos -@item amigados -These macros identify the machine as being an Amiga, running the -AmigaOS. - -@item AMIGA -@item MCH_AMIGA -These macros are provided for compatibility with other AmigaOS -@samp{C} compilers. -@end table - -@quotation -@emph{Note}: These symbols are available in three groups: plain (as -specified above), with two leading underscores, and with two leading -and two tailing underscores. The plain ones are not available when -compiling with the @samp{-ansi} option. - -The @samp{amigados} symbol is obsolete and will be removed in future. -Please use @samp{amigaos}, which was first made available in the -@samp{GCC} 2.7.2.1, @samp{Geek Gadgets} snapshot @samp{961012}. -@end quotation - -@node Options information, Keyword macros, Identifying machine, Defines -@section Symbols identifying specified options -@cindex Symbols identifying specified options -@cindex Symbols identifying CPU -@cindex Symbols identifying ixemul -@cindex Which CPU model options have been specified - -@samp{GCC} has several options to choose the CPU model that the code -should be generated for. The following preprocessor symbols identify -which options have been specified on the command line: - -@table @samp -@item mc68020 -Either one of @samp{-m68020}, @samp{-mc68020} or @samp{-mc68020-40} -has been specified. - -@item mc68030 -@samp{-m68030} has been specified. - -@item mc68040 -@samp{-m68040} has been specified. - -@item mc68060 -@samp{-m68060} @emph{[EXPERIMENTAL]} has been specified. - -@item __HAVE_68881__ -@samp{-m68881} has been specified. -@end table - -@quotation -@emph{Note}: The symbols beginning with @samp{mc} are available in -three groups: plain (as specified above), with two leading -underscores, and with two leading and two tailing underscores. The -plain ones are not available when compiling with the @samp{-ansi} -option. The ``underscored'' ones were first made available in the -@samp{GCC} 2.7.2.1, @samp{Geek Gadgets} snapshot @samp{970109}. - -@samp{mc68000} is defined regardless of which @samp{-m680x0} options -have been used. -@end quotation - -In addition to the above, a preprocessor symbol @samp{ixemul} -(together with the ``underscored'' versions) is available when not -compiling with @samp{-noixemul} (@pxref{-noixemul}) and identifies the -runtime environment as @samp{IXEmul}. This symbol was first made -available in the @samp{GCC} 2.7.2.1, @samp{Geek Gadgets} snapshot -@samp{970328}. - -@node Keyword macros, , Options information, Defines -@section ``Keyword'' macros -@cindex Keyword macros -@cindex Compatibility with other compilers - -Most AmigaOS-specific @samp{C} compilers have special ``custom -keywords'', which make the AmigaOS-specific development easier. -Unfortunately, the idea of ``custom keywords'' is not available in -@samp{GCC}. However, @samp{attributes} are available, and they provide -virtually identical functionality. For compatibility with other -AmigaOS @samp{C} compilers, preprocessor symbols are provided, which -expand to the appropriate @samp{attributes} (@pxref{Attributes}). - -@table @samp -@item __chip -@xref{chip}. - -@item __saveds -@xref{saveds}. - -@item __interrupt -@xref{interrupt}. - -@item __stackext -@xref{stackext}. - -@item __regargs -@xref{regparm}. - -@item __stdargs -@xref{stkparm}. - -@item __aligned -This expands to the standard @samp{GCC} -@samp{__attribute__((aligned(4)))}. -@end table - -@quotation -@emph{Note}: With @samp{SAS/C}, these keywords may be specified either -before or after the type, so the following declaration is correct: - -@example -__saveds void func(void); -@end example - -Unfortunately, the syntax rules of @samp{GCC} 2.7.2.1 do not allow to -specify the attributes before the type, so the above example must be -changed to: - -@example -void __saveds func(void); -@end example - -This will be fixed in @samp{GCC} 2.8.0. -@end quotation - -@node Miscellaneous, Index, Defines, Top -@chapter Miscellaneous -@cindex Miscellaneous -@cindex Uncategorizable - -The following ``hard to categorize'' features are available in the -AmigaOS port of @samp{GCC}: - -@menu -* Explicit register specification:: Specify registers for arguments. -* Case sensitive CPP:: <String.h> is not the same as <string.h> -* Library flavors:: Linker libraries. -@end menu - -@node Explicit register specification, Case sensitive CPP, Miscellaneous, Miscellaneous -@section Explicit register specification -@cindex Explicit register specification -@cindex Specify registers for arguments - -In certain situations, like writing callback hooks, ``patchers'', -standard shared libraries, etc., functions have to receive arguments -in particular registers. - -@samp{-mregparm} (@pxref{-mregparm}) is not appropriate in this case, -since it does not give the programmer enough control on @emph{which} -registers will be used. - -To overcome this problem in the AmigaOS port of @samp{GCC}, explicit -register specification has been extended to be available for function -arguments, as well: - -@example -void myhook(struct Hook* hook __asm("a0"), APTR object __asm("a2"), - APTR message __asm("a1")) -@{ - ... -@} -@end example - -@quotation -@emph{Note}: This feature is currently not available in @samp{G++}. - -Only the @samp{ANSI}-style declarations (prototypes) are supported. - -Registers have to be specified both in function declarations -(prototypes) and definitions (function code). -@end quotation - -This feature was first made available in the @samp{GCC} 2.7.2.1, -@samp{Geek Gadgets} snapshot @samp{961012}. - -@node Case sensitive CPP, Library flavors, Explicit register specification, Miscellaneous -@section Case sensitive CPP -@cindex Case sensitive CPP -@cindex <String.h> is not the same as <string.h> - -The preprocessor available in the AmigaOS port of @samp{GCC} is case -sensitive. This means, that the header names provided in the -@code{#include} directives have to be correct, including upper and -lower case letters. This affects only the way the preprocessor works. -Currently available native AmigaOS file systems are case insensitive. - -@quotation -@emph{Note}: This might seem like a horrible hack and a crazy attempt -to implement a ``ridiculous'' UNIX feature on Amiga. However, this -feature has been introduced to terminate the endless @samp{G++} -problems with a standard @samp{ANSI C} header @file{string.h}: under -the AmigaOS, a @samp{C++} header @file{String.h} would be included, -instead. -@end quotation - -@node Library flavors, , Case sensitive CPP, Miscellaneous -@section Library flavors -@cindex Library flavors -@cindex Linker libraries - -The AmigaOS port of @samp{GCC} may use different linker libraries -depending upon the options used while invoking the compiler. These -libraries reside in subdirectories of the standard locations, such as -@file{GG:lib/} or, with @samp{GCC} 2.7.2.1, -@file{GG:lib/gcc-lib/m68k-amigaos/2.7.2.1/}. - -If you invoke @code{gcc} with @samp{-v}, you'll see the precise flavor -of libraries used as a @samp{-fl} option in the @code{ld} invocation. -Here is a list of the available flavors (and hence the subdirectories -names): - -@itemize @bullet -@item -@file{libb} corresponds to the @ref{-fbaserel} option. -@item -@file{libb32} corresponds to the @ref{-fbaserel32} option. -@item -@file{libm020} corresponds to the @samp{-m68020} (or higher) options. -@item -@file{libm881} corresponds to the @samp{-m68881} option. -@item -@file{libnix} corresponds to the @ref{-noixemul} option. -@end itemize - -More than one flavor can be specified simultaneously. For example, -when both @ref{-fbaserel} and @samp{-m68020} are specified, the -libraries will be searched in @file{libb/libm020} subdirectory (as -well as in @file{libb} subdirectory and in the standard location). - -@node Index, , Miscellaneous, Top -@chapter Index -@printindex cp - -@contents -@bye diff --git a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p index c3dcdb7..6979667 100644 --- a/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p +++ b/m68k-unknown-amigaos/recipes/patches/gcc/gcc6.p @@ -1,21596 +1,1499 @@ -From 64dc72223bfc308f487ea8c70c6f961075cd4f24 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 1 Dec 2016 00:19:04 +0100 -Subject: [PATCH 001/303] @R add support for m68k-*-amiga - ---- - gcc/Makefile.in | 2 +- - gcc/amigacollect2.c | 348 ++++++++++++++++++ - gcc/c/c-decl.c | 78 ++++ - gcc/c/c-parser.c | 18 +- - gcc/c/c-tree.h | 4 + - gcc/calls.c | 2 +- - gcc/collect2.c | 31 ++ - gcc/config.gcc | 10 + - gcc/config/m68k/amigaos-protos.h | 58 +++ - gcc/config/m68k/amigaos.c | 773 +++++++++++++++++++++++++++++++++++++++ - gcc/config/m68k/amigaos.h | 490 +++++++++++++++++++++++++ - gcc/config/m68k/amigaos.opt | 13 + - gcc/config/m68k/host-amigaos.c | 42 +++ - gcc/config/m68k/m68k.c | 30 +- - gcc/config/m68k/m68k.h | 5 + - gcc/config/m68k/m68k.md | 2 + - gcc/config/m68k/m68kamigaos.h | 424 +++++++++++++++++++++ - gcc/config/m68k/m68kemb.h | 2 + - gcc/config/m68k/t-amigaos | 30 ++ - gcc/config/m68k/x-amigaos | 104 ++++++ - gcc/config/m68k/xm-amigaos.h | 64 ++++ - gcc/expr.c | 2 +- - gcc/function.c | 2 +- - gcc/ipa-chkp.c | 2 + - gcc/tree-chkp.c | 1 + - gcc/var-tracking.c | 2 +- - libstdc++-v3/configure | 4 + - 27 files changed, 2533 insertions(+), 10 deletions(-) - create mode 100755 gcc/amigacollect2.c - create mode 100755 gcc/config/m68k/amigaos-protos.h - create mode 100755 gcc/config/m68k/amigaos.c - create mode 100755 gcc/config/m68k/amigaos.h - create mode 100755 gcc/config/m68k/amigaos.opt - create mode 100755 gcc/config/m68k/host-amigaos.c - create mode 100755 gcc/config/m68k/m68kamigaos.h - create mode 100755 gcc/config/m68k/t-amigaos - create mode 100755 gcc/config/m68k/x-amigaos - create mode 100755 gcc/config/m68k/xm-amigaos.h - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 513f9c57013f..c1986279752f 100644 ---- gcc/Makefile.in -+++ gcc/Makefile.in -@@ -1985,7 +1985,7 @@ gcc-nm.c: gcc-ar.c - cp $^ $@ - - COLLECT2_OBJS = collect2.o collect2-aix.o tlink.o vec.o ggc-none.o \ -- collect-utils.o file-find.o hash-table.o -+ collect-utils.o file-find.o hash-table.o $(EXTRA_COLLECT2_OBJS) - COLLECT2_LIBS = @COLLECT2_LIBS@ - collect2$(exeext): $(COLLECT2_OBJS) $(LIBDEPS) - # Don't try modifying collect2 (aka ld) in place--it might be linking this. -diff --git a/gcc/amigacollect2.c b/gcc/amigacollect2.c +diff --git a/.cproject b/.cproject new file mode 100755 -index 000000000000..941ea0248fbe +index 000000000000..6db4cbe2447e --- /dev/null -+++ gcc/amigacollect2.c -@@ -0,0 +1,348 @@ -+/* GG-local whole file: dynamic libraries */ -+/* Supplimentary functions that get compiled and linked to collect2 for -+ AmigaOS target. -+ Copyright (C) 1996 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+#include "config.h" -+#include "system.h" -+#include "coretypes.h" -+#include "tm.h" -+ -+/* From collect2.c: */ -+ -+void maybe_unlink(const char *); -+void fatal_error(location_t, const char *, ...); -+void fork_execute(const char *, char **, bool); -+ -+extern char *c_file_name; -+extern int debug; -+ -+/* Local functions. */ -+ -+static void safename (char *); -+static void add_lib (const char *); -+static void cat (const char *, FILE *); -+ -+/* Names of temporary files we create. */ -+#define XLIBS_C_NAME "xlibs.c" -+#define XLIBS_O_NAME "xlibs.o" -+#define SHARED_X_NAME "shared.x" -+ -+/* Suffix which is prepended to "-l" options for dynamic libraries. */ -+#define DYNAMIC_LIB_SUFFIX "_ixlibrary" -+ -+/* Structure that holds library names. */ -+struct liblist -+{ -+ struct liblist *next; -+ char *name; -+ char *cname; -+}; -+ -+/* Not zero if "-static" was specified on GCC command line or if all the -+ libraries are static. */ -+static int flag_static=0; -+ -+/* Not zero if linking a base relative executable. This is recognized by -+ presence of "-m amiga_bss" on the linker's commandline. */ -+static int flag_baserel=0; -+ -+/* Not zero if some of the specified libraries are dynamic. */ -+static int found_dynamic_libs=0; -+ -+/* List of linker libraries. */ -+struct liblist *head = NULL; -+ -+/* Return 1 if collect2 should do something more apart from tlink. We want it -+ to call "postlink" and "strip" if linking with dynamic libraries. */ -+ -+int -+amigaos_do_collecting (void) -+{ -+ return !flag_static; -+} -+ -+/* Check for presence of "-static" on the GCC command line. We should not do -+ collecting if this flag was specified. */ -+ -+void -+amigaos_gccopts_hook (const char *arg) -+{ -+ if (strncmp(arg, "-static", strlen("-static"))==0) -+ flag_static=1; -+} -+ -+/* Replace unprintable characters with underscores. Used by "add_lib()". */ -+ -+static void -+safename (char *p) -+{ -+ if (!ISALPHA(*p)) -+ *p = '_'; -+ p++; -+ while (*p) -+ { -+ if (!ISALNUM(*p)) -+ *p = '_'; -+ p++; -+ } -+} -+ -+/* Add a library to the list of dynamic libraries. First make sure that the -+ library is actually dynamic. Used by "amigaos_libname_hook()". */ -+ -+static void -+add_lib (const char *name) -+{ -+ struct liblist *lib; -+ static char buf[256]; -+ -+ for (lib = head; lib; lib = lib->next) -+ if (!strcmp(lib->name, name)) -+ return; -+ -+ /* A2IXDIR_PREFIX is passed by "make". */ -+ sprintf(buf, A2IXDIR_PREFIX "/ldscripts/%s.x", name); -+ if (access(buf, R_OK)) -+ return; -+ -+ lib = (struct liblist*)xmalloc(sizeof(struct liblist)); -+ lib->name = xstrdup(name); -+ lib->cname = xstrdup(name); -+ safename(lib->cname); -+ lib->next = head; -+ head = lib; -+ -+ if (debug) -+ fprintf(stderr, "found dynamic library, name: %s, cname: %s\n", lib->name, -+ lib->cname); -+ -+ found_dynamic_libs=1; -+} -+ -+/* Check if the argument is a linker library. Call "add_lib()" if yes. */ -+ -+void -+amigaos_libname_hook (const char *arg) -+{ -+ int len = strlen(arg); -+ if (flag_static) -+ return; -+ -+ if (len > 2 && !memcmp(arg, "-l", 2)) -+ add_lib(arg + 2); -+ else if (len > 2 && !strcmp(arg + len - 2, ".a")) -+ { -+ const char *lib; -+ -+ ((char*)arg)[len - 2] = '\0'; -+ lib = strrchr(arg, '/'); -+ if (lib == NULL) -+ lib = strrchr(arg, ':'); -+ if (lib == NULL) -+ lib = arg - 1; -+ if (!strncmp(lib + 1, "lib", 3)) -+ add_lib(lib + 4); -+ ((char *)arg)[len - 2] = '.'; -+ } -+} -+ -+/* Delete temporary files. */ -+ -+void -+amigaos_collect2_cleanup (void) -+{ -+ if (flag_static) -+ return; -+ maybe_unlink(XLIBS_C_NAME); -+ maybe_unlink(XLIBS_O_NAME); -+ maybe_unlink(SHARED_X_NAME); -+} -+ -+/* Copy file named by FNAME to X. */ -+ -+static void -+cat (const char *fname, FILE *x) -+{ -+#define BUFSIZE 16384 -+ FILE *in; -+ static char buf[BUFSIZE]; -+ int bytes; -+ -+ in = fopen(fname, "r"); -+ if (in == NULL) -+ fatal_error (input_location, "%s", fname); -+ while (!feof(in) && (bytes = fread(buf, 1, BUFSIZE, in))) -+ fwrite(buf, 1, bytes, x); -+ fclose(in); -+} -+ -+/* If no dynamic libraries were found, perform like "-static". Otherwise, -+ create "xlibs.c", "shared.x" and invoke "gcc" to create "xlibs.o". We also -+ have to adjust the linker commandline. */ -+ -+void -+amigaos_prelink_hook (const char **ld1_argv, int *strip_flag) -+{ -+ if (flag_static) -+ return; -+ -+ if (!found_dynamic_libs) -+ { -+ flag_static=1; -+ /* If the user has not requested "-static", but has requested "-s", -+ collect2 removes "-s" from the "ld1_argv", and calls "strip" after -+ linking. However, this would not be efficient if we linked the -+ executable without any dynamic library. In this case, we put "-s" -+ back. */ -+ if (*strip_flag) -+ { -+ /* Add "-s" as the last argument on the command line. */ -+ while (*ld1_argv) -+ ld1_argv++; -+ *ld1_argv++="-s"; -+ *ld1_argv=0; -+ *strip_flag=0; -+ } -+ } -+ else -+ { -+ FILE *x, *out; -+ struct liblist *lib; -+ static const char* argv[]={0, "-c", XLIBS_C_NAME, 0}; -+ const char **ld1_end, **ld1; -+ -+ /* Prepend suffixes to dynamic lib names. In addition, check if we are -+ linking a base relative executable. */ -+ for (ld1=ld1_argv; *ld1; ld1++) -+ { -+ int len=strlen(*ld1); -+ if (strncmp(*ld1, "-l", strlen("-l"))==0) -+ { -+ for (lib=head; lib; lib=lib->next) -+ if (strcmp(*ld1+strlen("-l"), lib->name)==0) -+ { -+ char *newname=(char*) -+ xmalloc(strlen(*ld1)+strlen(DYNAMIC_LIB_SUFFIX)+1); -+ strcpy(newname, *ld1); -+ strcat(newname, DYNAMIC_LIB_SUFFIX); -+ *ld1=newname; -+ break; -+ } -+ } -+ else if (len > 2 && !strcmp(*ld1 + len - 2, ".a")) -+ { -+ const char *libname; -+ int substituted=0; -+ -+ ((char *)(*ld1))[len - 2] = '\0'; -+ libname = strrchr(*ld1, '/'); -+ if (libname == NULL) -+ libname = strrchr(*ld1, ':'); -+ if (libname == NULL) -+ libname = *ld1 - 1; -+ if (!strncmp(libname + 1, "lib", 3)) -+ for (lib=head; lib; lib=lib->next) -+ if (strcmp(libname+4, lib->name)==0) -+ { -+ char *newname=(char*)xmalloc(strlen(*ld1)+ -+ strlen(DYNAMIC_LIB_SUFFIX)+3); -+ strcpy(newname, *ld1); -+ strcat(newname, DYNAMIC_LIB_SUFFIX); -+ strcat(newname, ".a"); -+ *ld1=newname; -+ substituted=1; -+ break; -+ } -+ if (!substituted) -+ ((char *)(*ld1))[len - 2] = '.'; -+ } -+ else if (strcmp(ld1[0], "-m")==0 && ld1[1] -+ && strcmp(ld1[1], "amiga_bss")==0) -+ { -+ flag_baserel=1; -+ break; -+ } -+ } -+ -+ out = fopen(XLIBS_C_NAME, "w"); -+ if (out == NULL) -+ fatal_error (input_location, "%s", XLIBS_C_NAME); -+ x = fopen(SHARED_X_NAME, "w"); -+ if (x == NULL) -+ fatal_error (input_location, "%s", SHARED_X_NAME); -+ -+ cat((flag_baserel ? A2IXDIR_PREFIX "/amiga_exe_baserel_script.x" -+ : A2IXDIR_PREFIX "/amiga_exe_script.x"), x); -+ for (lib = head; lib; lib = lib->next) -+ { -+ static char buf[256]; -+ sprintf(buf, A2IXDIR_PREFIX "/ldscripts/%s.x", lib->name); -+ fprintf(out, "extern long %sBase; long *__p%sBase = &%sBase;\n", -+ lib->cname, lib->cname, lib->cname); -+ cat(buf, x); -+ } /* {{ */ -+ fprintf(x, "}}\n"); -+ fclose(out); -+ fclose(x); -+ argv[0]=c_file_name; -+ fork_execute("gcc", (char **)argv, false); -+ -+ /* Unfortunately, unlike "-s", "-T" cannot be specified as the last -+ argument. We put it after "-L" args. */ -+ ld1_end=ld1_argv; -+ while (*ld1_end) -+ ld1_end++; -+ ld1_end++; -+ /* "ld1_end" now points after the terminating 0 of "ld1_argv". */ -+ -+ ld1=ld1_end-2; -+ while (ld1>ld1_argv && strncmp(*ld1, "-L", strlen("-L"))) -+ ld1--; -+ if (ld1==ld1_argv) -+ fatal_error (input_location, "no -L arguments"); -+ ld1++; -+ /* "ld1" now points after "-L". */ -+ -+ /* Shift all the arguments after "-L" one position right. */ -+ memmove(ld1+1, ld1, (ld1_end-ld1)*sizeof(*ld1)); -+ /* Put -Tshared.x in the now empty space. */ -+ *ld1="-T" SHARED_X_NAME; -+ } -+} -+ -+/* Be lazy and just call "postlink". */ -+ -+void -+amigaos_postlink_hook (const char *output_file) -+{ -+ static const char *argv[]={"postlink", 0, 0, 0}; -+ if (flag_static) -+ return; -+ -+ if (flag_baserel) -+ { -+ argv[1]="-baserel"; -+ argv[2]=output_file; -+ } -+ else -+ argv[1]=output_file; -+ fork_execute("postlink", (char **)argv, false); -+} -diff --git a/gcc/c/c-decl.c b/gcc/c/c-decl.c -index b237e93b927d..3107bdfac430 100644 ---- gcc/c/c-decl.c -+++ gcc/c/c-decl.c -@@ -51,6 +51,8 @@ along with GCC; see the file COPYING3. If not see - #include "c-family/c-ada-spec.h" - #include "cilk.h" - #include "builtins.h" -+#include "output.h" -+#include "tm_p.h" - - /* In grokdeclarator, distinguish syntactic contexts of declarators. */ - enum decl_context -@@ -5024,6 +5026,29 @@ grokparm (const struct c_parm *parm, tree *expr) - return decl; - } - -+#ifdef TARGET_AMIGA -+ -+/* Create a new variant of TYPE, equivalent but distinct. -+ This is so the caller can modify it. */ -+ -+static tree -+build_type_copy (tree type) -+ { -+ tree t, m = TYPE_MAIN_VARIANT (type); -+ -+ t = copy_node (type); -+ -+ TYPE_POINTER_TO (t) = 0; -+ TYPE_REFERENCE_TO (t) = 0; -+ -+ /* Add this type to the chain of variants of TYPE. */ -+ TYPE_NEXT_VARIANT (t) = TYPE_NEXT_VARIANT (m); -+ TYPE_NEXT_VARIANT (m) = t; -+ -+ return t; -+ } -+#endif -+ - /* Given a parsed parameter declaration, decode it into a PARM_DECL - and push that on the current scope. EXPR is a pointer to an - expression that needs to be evaluated for the side effects of array -@@ -5041,6 +5066,59 @@ push_parm_decl (const struct c_parm *parm, tree *expr) - - decl = pushdecl (decl); - -+#ifdef TARGET_AMIGAOS -+ if (parm->asmspec) -+ { -+ tree atype = TREE_TYPE(decl); -+ const char *asmspec = TREE_STRING_POINTER(parm->asmspec); -+ if (*asmspec == '%') -+ ++asmspec; -+ int reg_number = decode_reg_name (asmspec); -+ -+ /* First detect errors in declaring global registers. */ -+ if (reg_number == -1) -+ error ("%Jregister name not specified for %qD", decl, decl); -+ else if (reg_number < 0) -+ error ("%Jinvalid register name for %qD", decl, decl); -+ else if (TYPE_MODE (TREE_TYPE (decl)) == BLKmode) -+ error ("%Jdata type of %qD isn%'t suitable for a register", decl, decl); -+ else if (!HARD_REGNO_MODE_OK(reg_number, TYPE_MODE (TREE_TYPE (decl)))) -+ error ("%Jregister specified for %qD isn%'t suitable for data type", -+ decl, decl); -+ /* Now handle properly declared static register variables. */ -+ else -+ { -+ /* Build tree for __attribute__ ((asm(regnum))). */ -+ FIXED_VALUE_TYPE fv = -+ { reg_number, 0, BImode }; -+ tree ttasm = get_identifier("asm"); -+ tree t, attrs = tree_cons(ttasm, build_fixed (ttasm, fv), NULL_TREE); -+ /* First check whether such a type already exists - if yes, use -+ that one. This is very important, since otherwise -+ common_type() would think that it sees two different -+ types and would try to merge them - this could result in -+ warning messages. */ -+ for (t = TYPE_MAIN_VARIANT(atype); t; t = TYPE_NEXT_VARIANT(t)) -+ if (comptypes (t, atype) == 1 -+ && attribute_list_equal (TYPE_ATTRIBUTES(t), attrs)) -+ break; -+ if (t) -+ atype = t; -+ else -+ { -+ /* Create a new variant, with differing attributes. -+ (Hack! Type with differing attributes should no longer be -+ a variant of its main type. See comment above for -+ explanation why this was necessary). */ -+ atype = build_type_copy (atype); -+ TYPE_ATTRIBUTES(atype) = chainon (attrs, TYPE_ATTRIBUTES(atype)); -+ } -+ TREE_TYPE(decl) = atype; -+// printf("%s using %s, cdecl=%p, type=%p\n", IDENTIFIER_POINTER(DECL_NAME (decl), asmspec, decl, atype); -+ } -+ } -+#endif -+ - finish_decl (decl, input_location, NULL_TREE, NULL_TREE, NULL_TREE); - } - -diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c -index c9eb8ddbae3a..d8725b572b55 100644 ---- gcc/c/c-parser.c -+++ gcc/c/c-parser.c -@@ -3837,10 +3837,26 @@ c_parser_parameter_declaration (c_parser *parser, tree attrs) - c_parser_skip_until_found (parser, CPP_COMMA, NULL); - return NULL; - } -+ /** -+ * SBF: Add support for __asm("xy") register spec. -+ */ -+#ifdef TARGET_AMIGAOS -+ tree asmspec = NULL_TREE; -+ if (c_parser_next_token_is_keyword (parser, RID_ASM)) -+ { -+ asmspec = c_parser_simple_asm_expr (parser); -+// printf("asmspec: %s\n", TREE_STRING_POINTER(asmspec)); -+ } -+#endif - if (c_parser_next_token_is_keyword (parser, RID_ATTRIBUTE)) - postfix_attrs = c_parser_attributes (parser); -- return build_c_parm (specs, chainon (postfix_attrs, prefix_attrs), -+ -+ struct c_parm * cparm = build_c_parm (specs, chainon (postfix_attrs, prefix_attrs), - declarator); -+#ifdef TARGET_AMIGAOS -+ cparm->asmspec = asmspec; -+#endif -+ return cparm; - } - - /* Parse a string literal in an asm expression. It should not be -diff --git a/gcc/c/c-tree.h b/gcc/c/c-tree.h -index bb12a200f709..e3404fd8b0a6 100644 ---- gcc/c/c-tree.h -+++ gcc/c/c-tree.h -@@ -453,6 +453,10 @@ struct c_parm { - tree attrs; - /* The declarator. */ - struct c_declarator *declarator; -+#ifdef TARGET_AMIGAOS -+ /* The optional asm spec to specify the register. */ -+ tree asmspec; -+#endif - }; - - /* Used when parsing an enum. Initialized by start_enum. */ -diff --git a/gcc/calls.c b/gcc/calls.c -index 6cc1fc721e45..e5188b93ba94 100644 ---- gcc/calls.c -+++ gcc/calls.c -@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple.h" - #include "predict.h" --#include "tm_p.h" - #include "stringpool.h" - #include "expmed.h" - #include "optabs.h" -diff --git a/gcc/collect2.c b/gcc/collect2.c -index bffac802b8fe..f52a66ef1b58 100644 ---- gcc/collect2.c -+++ gcc/collect2.c -@@ -1392,6 +1392,11 @@ main (int argc, char **argv) - add_to_list (&libs, s); - } - #endif -+ /* begin-GG-local: dynamic libraries */ -+ #ifdef COLLECT2_LIBNAME_HOOK -+ COLLECT2_LIBNAME_HOOK(arg); -+ #endif -+ /* end-GG-local */ - break; - - #ifdef COLLECT_EXPORT_LIST -@@ -1492,6 +1497,11 @@ main (int argc, char **argv) - add_to_list (&libs, arg); - } - #endif -+ /* begin-GG-local: dynamic libraries */ -+#ifdef COLLECT2_LIBNAME_HOOK -+ COLLECT2_LIBNAME_HOOK(arg); -+#endif -+ /* end-GG-local */ - } - } - -@@ -1608,6 +1618,11 @@ main (int argc, char **argv) - - fprintf (stderr, "\n"); - } -+ /* begin-GG-local: dynamic libraries */ -+#ifdef COLLECT2_PRELINK_HOOK -+ COLLECT2_PRELINK_HOOK(ld1_argv, &strip_flag); -+#endif -+ /* end-GG-local */ - - /* Load the program, searching all libraries and attempting to provide - undefined symbols from repository information. -@@ -1648,6 +1663,8 @@ main (int argc, char **argv) - } - } - -+ /* begin-GG-local: dynamic libraries */ -+#ifndef COLLECT2_POSTLINK_HOOK - /* Unless we have done it all already, examine the namelist and search for - static constructors and destructors to call. Write the constructor and - destructor tables to a .s file and reload. */ -@@ -1674,6 +1691,10 @@ main (int argc, char **argv) - frame_tables.number), - frame_tables.number); - } -+#else /* COLLECT2_POSTLINK_HOOK */ -+ COLLECT2_POSTLINK_HOOK(output_file); -+#endif -+/* end-GG-local */ - - /* If the scan exposed nothing of special interest, there's no need to - generate the glue code and relink so return now. */ -@@ -1716,6 +1737,11 @@ main (int argc, char **argv) - - maybe_unlink (c_file); - maybe_unlink (o_file); -+ /* begin-GG-local: dynamic libraries */ -+#ifdef COLLECT2_EXTRA_CLEANUP -+ COLLECT2_EXTRA_CLEANUP(); -+#endif -+ /* end-GG-local */ - return 0; - } - -@@ -1821,6 +1847,11 @@ main (int argc, char **argv) - maybe_unlink (export_file); - #endif - -+ /* begin-GG-local: dynamic libraries */ -+#ifdef COLLECT2_EXTRA_CLEANUP -+ COLLECT2_EXTRA_CLEANUP(); -+#endif -+ /* end-GG-local */ - return 0; - } - -diff --git a/gcc/config.gcc b/gcc/config.gcc -index 1d5b23f228d2..3ef1a5f110f3 100644 ---- gcc/config.gcc -+++ gcc/config.gcc -@@ -1931,6 +1931,16 @@ m68k-*-elf* | fido-*-elf*) - ;; - esac - ;; -+m68k*-*-amigaos*) -+ default_m68k_cpu=68000 -+ tm_file="${tm_file} dbx.h newlib-stdint.h m68k/m68kamigaos.h" -+ tm_defines="${tm_defines} MOTOROLA=1 TARGET_AMIGAOS TARGET_CPU_DEFAULT=0" -+ tmake_file="m68k/t-floatlib m68k/t-m68kbare m68k/t-amigaos" -+ tm_p_file="${tm_p_file} m68k/amigaos-protos.h" -+ extra_objs=amigaos.o -+ extra_options="${extra_options} m68k/amigaos.opt" -+ gnu_ld=yes -+ ;; - m68k*-*-netbsdelf*) - default_m68k_cpu=68020 - default_cf_cpu=5475 -diff --git a/gcc/config/m68k/amigaos-protos.h b/gcc/config/m68k/amigaos-protos.h -new file mode 100755 -index 000000000000..66b553ab568f ---- /dev/null -+++ gcc/config/m68k/amigaos-protos.h -@@ -0,0 +1,58 @@ -+/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. -+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 -+ Free Software Foundation, Inc. -+ Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). -+ Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+#undef TARGET_AMIGAOS -+#define TARGET_AMIGAOS 1 -+ -+extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *, tree); -+ -+/* Initialize a variable CUM of type CUMULATIVE_ARGS -+ for a call to a function whose data type is FNTYPE. -+ For a library call, FNTYPE is 0. */ -+ -+#undef INIT_CUMULATIVE_ARGS -+#define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \ -+ (amigaos_init_cumulative_args(&(CUM), (FNTYPE))) -+ -+ -+extern int amigaos_restore_a4 (void); -+#ifdef RTX_CODE -+extern int read_only_operand (rtx); -+extern void amigaos_select_section (tree, int, unsigned HOST_WIDE_INT); -+extern void amigaos_encode_section_info (tree, rtx, int); -+extern void amigaos_alternate_pic_setup (FILE *); -+extern void amigaos_prologue_begin_hook (FILE *, int); -+extern void amigaos_alternate_frame_setup_f (FILE *, int); -+extern void amigaos_alternate_frame_setup (FILE *, int); -+extern struct rtx_def* gen_stack_cleanup_call (rtx, rtx); -+extern void amigaos_alternate_allocate_stack (rtx *); -+#ifdef TREE_CODE -+//extern void amigaos_function_arg_advance (CUMULATIVE_ARGS *); -+extern struct rtx_def *amigaos_function_arg (CUMULATIVE_ARGS *, enum machine_mode, tree); -+#endif -+#endif -+#ifdef TREE_CODE -+extern tree amigaos_handle_decl_attribute (tree *, tree, tree, int, bool *); -+extern tree amigaos_handle_type_attribute (tree *, tree, tree, int, bool *); -+#endif -+ -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -new file mode 100755 -index 000000000000..90bc3218bab7 ---- /dev/null -+++ gcc/config/m68k/amigaos.c -@@ -0,0 +1,773 @@ -+/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. -+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 -+ Free Software Foundation, Inc. -+ Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). -+ Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+//work without flag_writable_strings which is not in GCC4 -+#define REGPARMS_68K 1 -+ -+#include "config.h" -+#include "system.h" -+#include "coretypes.h" -+#include "tm.h" -+#include "rtl.h" -+#include "output.h" -+#include "tree.h" -+#include "attribs.h" -+#include "flags.h" -+#include "expr.h" -+#include "toplev.h" -+#include "tm_p.h" -+#include "target.h" -+#include "diagnostic-core.h" -+#include "config/m68k/amigaos.h" -+ -+ -+#if 0 -+static int amigaos_put_in_text (tree); -+static rtx gen_stack_management_call (rtx, rtx, const char *); -+ -+/* Baserel support. */ -+ -+/* Does operand (which is a symbolic_operand) live in text space? If -+ so SYMBOL_REF_FLAG, which is set by ENCODE_SECTION_INFO, will be true. -+ -+ This function is used in base relative code generation. */ -+ -+int -+read_only_operand (rtx operand) -+{ -+ if (GET_CODE (operand) == CONST) -+ operand = XEXP (XEXP (operand, 0), 0); -+ if (GET_CODE (operand) == SYMBOL_REF) -+ return SYMBOL_REF_FLAG (operand) || CONSTANT_POOL_ADDRESS_P (operand); -+ return 1; -+} -+ -+/* Choose the section to use for DECL. RELOC is true if its value contains -+ any relocatable expression. */ -+ -+void -+amigaos_select_section (tree decl ATTRIBUTE_UNUSED, int reloc ATTRIBUTE_UNUSED, -+ unsigned HOST_WIDE_INT align ATTRIBUTE_UNUSED) -+{ -+ // if (TREE_CODE (decl) == STRING_CST) -+// { -+//// flag_writable_strings /data_section not in gcc4, -+////make life easy and put to same section -+//// if (! flag_writable_strings) -+//// readonly_data_section (); -+//// else -+// //data_section (); -+// } -+// else if (TREE_CODE (decl) == VAR_DECL) -+// { -+// if (TREE_READONLY (decl) -+// && ! TREE_THIS_VOLATILE (decl) -+// && DECL_INITIAL (decl) -+// && (DECL_INITIAL (decl) == error_mark_node -+// || TREE_CONSTANT (DECL_INITIAL (decl))) -+// && (!flag_pic || (flag_pic<3 && !reloc) -+// || SYMBOL_REF_FLAG (XEXP (DECL_RTL (decl), 0)))) -+// readonly_data_section (); -+// else -+// data_section (); -+// } -+// else if ((!flag_pic || (flag_pic<3 && !reloc)) && DECL_P(decl) -+// && SYMBOL_REF_FLAG (XEXP (DECL_RTL (decl), 0))) -+// readonly_data_section (); -+// else -+ //data_section (); -+} -+ -+/* This function is used while generating a base relative code. -+ It returns 1 if a decl is not relocatable, i. e., if it can be put -+ in the text section. -+ Currently, it's very primitive: it just checks if the object size -+ is less than 4 bytes (i. e., if it can hold a pointer). It also -+ supports arrays and floating point types. */ -+ -+static int -+amigaos_put_in_text (tree decl) -+{ -+ tree type = TREE_TYPE (decl); -+ if (TREE_CODE (type) == ARRAY_TYPE) -+ type = TREE_TYPE (type); -+ return (TREE_INT_CST_ELT(TYPE_SIZE (type), 1) == 0 -+ && TREE_INT_CST_LOW (TYPE_SIZE (type)) < 32) -+ || FLOAT_TYPE_P (type); -+} -+ -+/* Record properties of a DECL into the associated SYMBOL_REF. */ -+ -+void -+amigaos_encode_section_info (tree decl, rtx rtl, int first) -+{ -+ default_encode_section_info (decl, rtl, first); -+ -+ -+ SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; -+ if (TREE_CODE (decl) == FUNCTION_DECL) // huh seem do same. not in gcc4 flag_writable_strings -+ SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; -+ else -+ { -+ if ((MEM_READONLY_P (rtl) && !MEM_VOLATILE_P (rtl) -+ && (flag_pic<3 || (TREE_CODE (decl) == STRING_CST -+ ) -+ || amigaos_put_in_text (decl))) -+ || (TREE_CODE (decl) == VAR_DECL -+ && DECL_SECTION_NAME (decl) != NULL)) -+ SYMBOL_REF_FLAG (XEXP (rtl, 0)) = 1; -+ } -+} -+ -+/* Common routine used to check if a4 should be preserved/restored. */ -+ -+int -+amigaos_restore_a4 (void) -+{ -+ return (flag_pic >= 3 && -+ (TARGET_RESTORE_A4 || TARGET_ALWAYS_RESTORE_A4 -+ || lookup_attribute ("saveds", -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl))))); -+} -+ -+void -+amigaos_alternate_pic_setup (FILE *stream) -+{ -+ if (TARGET_RESTORE_A4 || TARGET_ALWAYS_RESTORE_A4) -+ asm_fprintf (stream, "\tjbsr %U__restore_a4\n"); -+ else if (lookup_attribute ("saveds", -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) -+ asm_fprintf (stream, "\tlea %U__a4_init,%Ra4\n"); -+} -+ -+/* Attributes support. */ -+ -+#define AMIGA_CHIP_SECTION_NAME ".datachip" -+ -+/* Handle a "chip" attribute; -+ arguments as in struct attribute_spec.handler. */ -+ -+tree -+amigaos_handle_decl_attribute (tree *node, tree name, -+ tree args ATTRIBUTE_UNUSED, -+ int flags ATTRIBUTE_UNUSED, -+ bool *no_add_attrs) -+{ -+ if (TREE_CODE (*node) == VAR_DECL) -+ { -+ if (is_attribute_p ("chip", name)) -+#ifdef TARGET_ASM_NAMED_SECTION -+ { -+ if (! TREE_STATIC (*node) && ! DECL_EXTERNAL (*node)) -+ error ("`chip' attribute cannot be specified for local variables"); -+ else -+ { -+ /* The decl may have already been given a section attribute from -+ a previous declaration. Ensure they match. */ -+ if (DECL_SECTION_NAME (*node) == NULL_TREE) -+ DECL_SECTION_NAME (*node) = -+ build_string (strlen (AMIGA_CHIP_SECTION_NAME) + 1, -+ AMIGA_CHIP_SECTION_NAME); -+ else if (strcmp (TREE_STRING_POINTER (DECL_SECTION_NAME (*node)), -+ AMIGA_CHIP_SECTION_NAME) != 0) -+ { -+ error_with_decl (*node, -+ "`chip' for `%s' conflicts with previous declaration"); -+ } -+ } -+ } -+#else -+ error ("`chip' attribute is not supported for this target"); -+#endif -+ } -+ else -+ { -+ warning (OPT_Wattributes, "`%s' attribute only applies to variables", -+ IDENTIFIER_POINTER (name)); -+ *no_add_attrs = true; -+ } -+ -+ return NULL_TREE; -+} -+ -+//----- from 68k.c start -+ -+ -+ -+ -+ -+ -+/* Stack checking and automatic extension support. */ -+ -+void -+amigaos_prologue_begin_hook (FILE *stream, int fsize) -+{ -+ if (TARGET_STACKCHECK) -+ { -+ if (fsize < 256) -+ asm_fprintf (stream, "\tcmpl %s,%Rsp\n" -+ "\tjcc 0f\n" -+ "\tjra %U__stkovf\n" -+ "\t0:\n", -+ (flag_pic == 3 ? "a4@(___stk_limit:W)" : -+ (flag_pic == 4 ? "a4@(___stk_limit:L)" : -+ "___stk_limit"))); -+ else -+ asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__stkchk_d0\n", -+ fsize); -+ } -+} -+ -+void -+amigaos_alternate_frame_setup_f (FILE *stream, int fsize) -+{ -+ if (fsize < 128) -+ asm_fprintf (stream, "\tcmpl %s,%Rsp\n" -+ "\tjcc 0f\n" -+ "\tmoveq %I%d,%Rd0\n" -+ "\tmoveq %I0,%Rd1\n" -+ "\tjbsr %U__stkext_f\n" -+ "0:\tlink %Ra5,%I%d:W\n", -+ (flag_pic == 3 ? "a4@(___stk_limit:W)" : -+ (flag_pic == 4 ? "a4@(___stk_limit:L)" : -+ "___stk_limit")), -+ fsize, -fsize); -+ else -+ asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__link_a5_d0_f\n", -+ fsize); -+} -+ -+void -+amigaos_alternate_frame_setup (FILE *stream, int fsize) -+{ -+ if (!fsize) -+ asm_fprintf (stream, "\tcmpl %s,%Rsp\n" -+ "\tjcc 0f\n" -+ "\tmoveq %I0,%Rd0\n" -+ "\tmoveq %I0,%Rd1\n" -+ "\tjbsr %U__stkext_f\n" -+ "0:\n", -+ (flag_pic == 3 ? "a4@(___stk_limit:W)" : -+ (flag_pic == 4 ? "a4@(___stk_limit:L)" : -+ "___stk_limit"))); -+ else if (fsize < 128) -+ asm_fprintf (stream, "\tcmpl %s,%Rsp\n" -+ "\tjcc 0f\n" -+ "\tmoveq %I%d,%Rd0\n" -+ "\tmoveq %I0,%Rd1\n" -+ "\tjbsr %U__stkext_f\n" -+ "0:\taddw %I%d,%Rsp\n", -+ (flag_pic == 3 ? "a4@(___stk_limit:W)" : -+ (flag_pic == 4 ? "a4@(___stk_limit:L)" : -+ "___stk_limit")), -+ fsize, -fsize); -+ else -+ asm_fprintf (stream, "\tmovel %I%d,%Rd0\n\tjbsr %U__sub_d0_sp_f\n", -+ fsize); -+} -+ -+//static rtx -+//gen_stack_management_call (rtx stack_pointer, rtx arg, const char *func) -+//{ -+// rtx call_insn, call, seq, name; -+// start_sequence (); -+// -+// /* Move arg to d0. */ -+// emit_move_insn (gen_rtx_REG (SImode, 0), arg); -+// -+// /* Generate the function reference. */ -+// name = gen_rtx_SYMBOL_REF (Pmode, func); -+// SYMBOL_REF_FLAG (name) = 1; -+// /* If optimizing, put it in a psedo so that several loads can be merged -+// into one. */ -+// if (optimize && ! flag_no_function_cse) -+// name = copy_to_reg (name); -+// -+// /* Generate the function call. */ -+// call = gen_rtx_CALL (VOIDmode, gen_rtx_MEM (FUNCTION_MODE, name), -+// const0_rtx); -+// /* If we are doing stack extension, notify about the sp change. */ -+// if (stack_pointer) -+// call = gen_rtx_SET (VOIDmode, stack_pointer, call); -+// -+// /* Generate the call instruction. */ -+// call_insn = emit_call_insn (call); -+// /* Stack extension does not change memory in an unpredictable way. */ -+// RTL_CONST_OR_PURE_CALL_P (call_insn) = 1; -+// /* We pass an argument in d0. */ -+// CALL_INSN_FUNCTION_USAGE (call_insn) = gen_rtx_EXPR_LIST (VOIDmode, -+// gen_rtx_USE (VOIDmode, gen_rtx_REG (SImode, 0)), 0); -+// -+// seq = get_insns (); -+// end_sequence (); -+// return seq; -+//} -+// -+//rtx -+//gen_stack_cleanup_call (rtx stack_pointer, rtx sa) -+//{ -+// return gen_stack_management_call (stack_pointer, sa, "__move_d0_sp"); -+//} -+// -+//void -+//amigaos_alternate_allocate_stack (rtx *operands) -+//{ -+// if (TARGET_STACKEXTEND) -+// emit_insn (gen_stack_management_call (stack_pointer_rtx, operands[1], -+// "__sub_d0_sp")); -+// else -+// { -+// if (TARGET_STACKCHECK) -+// emit_insn (gen_stack_management_call (0, operands[1], "__stkchk_d0")); -+// anti_adjust_stack (operands[1]); -+// } -+// emit_move_insn (operands[0], virtual_stack_dynamic_rtx); -+//} -+#endif -+ -+/* -+ * begin-GG-local: explicit register specification for parameters. -+ * -+ * Reworked and ported to gcc-6.2.0 by Stefan "Bebbo" Franke. -+ */ -+ -+/** -+ * Define this here and add it to tm_p -> all know the custom type and allocate/use the correct size. -+ */ -+struct amigaos_args -+{ -+ int num_of_regs; -+ long regs_already_used; -+ int last_arg_reg; -+ int last_arg_len; -+ tree formal_type; /* New field: formal type of the current argument. */ -+}; -+ -+static struct amigaos_args mycum; -+static CUMULATIVE_ARGS * lastcum; -+ -+/* Argument-passing support functions. */ -+ -+/* Initialize a variable CUM of type CUMULATIVE_ARGS -+ for a call to a function whose data type is FNTYPE. -+ For a library call, FNTYPE is 0. */ -+ -+void -+amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype) -+{ -+ struct amigaos_args * cum = &mycum; -+ lastcum = cump; -+ cum->num_of_regs = amigaos_regparm; -+// printf("amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs); fflush(stdout); -+ -+ /* Initialize a variable CUM of type CUMULATIVE_ARGS -+ for a call to a function whose data type is FNTYPE. -+ For a library call, FNTYPE is 0. */ -+ -+ cum->last_arg_reg = -1; -+ cum->regs_already_used = 0; -+ -+ if (fntype) -+ { -+ if (lookup_attribute ("stkparm", TYPE_ATTRIBUTES(fntype))) -+ cum->num_of_regs = 0; -+ else -+ { -+ tree ratree = lookup_attribute ("regparm", TYPE_ATTRIBUTES(fntype)); -+ cum->num_of_regs = amigaos_regparm ? -+ amigaos_regparm : AMIGAOS_DEFAULT_REGPARM; -+ if (ratree) -+ { -+ tree args = TREE_VALUE(ratree); -+ -+ if (args && TREE_CODE (args) == TREE_LIST) -+ { -+ tree val = TREE_VALUE(args); -+ if (TREE_CODE (val) == INTEGER_CST) -+ { -+ int no = TREE_INT_CST_LOW(val); -+ if (no > 0 && no < AMIGAOS_MAX_REGPARM) -+ cum->num_of_regs = no; -+ } -+ } -+ } -+ } -+ } -+ else -+ /* Libcall. */ -+ cum->num_of_regs = 0; -+ -+ if (cum->num_of_regs) -+ { -+ /* If this is a vararg call, put all arguments on stack. */ -+ tree param, next_param; -+ for (param = TYPE_ARG_TYPES(fntype); param; param = next_param) -+ { -+ next_param = TREE_CHAIN(param); -+ if (!next_param && TREE_VALUE (param) != void_type_node) -+ cum->num_of_regs = 0; -+ } -+ } -+ -+ //#if ! defined (PCC_STATIC_STRUCT_RETURN) && defined (M68K_STRUCT_VALUE_REGNUM) -+ // /* If return value is a structure, and we pass the buffer address in a -+ // register, we can't use this register for our own purposes. -+ // FIXME: Something similar would be useful for static chain. */ -+ // if (fntype && aggregate_value_p (TREE_TYPE (fntype), fntype)) -+ // cum->regs_already_used |= (1 << M68K_STRUCT_VALUE_REGNUM); -+ //#endif -+ -+ if (fntype) -+ cum->formal_type = TYPE_ARG_TYPES(fntype); -+ else -+ /* Call to compiler-support function. */ -+ cum->formal_type = 0; -+} -+ -+/* Update the data in CUM to advance over an argument. */ -+ -+void -+amigaos_function_arg_advance (cumulative_args_t cum_v, machine_mode, const_tree, -+ bool) -+{ -+ struct amigaos_args * cum = &mycum; -+ CUMULATIVE_ARGS *cump = (CUMULATIVE_ARGS *) get_cumulative_args (cum_v); -+ /* Update the data in CUM to advance over an argument. */ -+ -+ // printf("amigaos_function_arg_advance1 %p\r\n", cump); fflush(stdout); -+ if (cump != lastcum) -+ return; -+ -+ if (cum->last_arg_reg != -1) -+ { -+ int count; -+ for (count = 0; count < cum->last_arg_len; count++) -+ cum->regs_already_used |= (1 << (cum->last_arg_reg + count)); -+ cum->last_arg_reg = -1; -+ } -+ -+ if (cum->formal_type) -+ cum->formal_type = TREE_CHAIN(cum->formal_type); -+} -+ -+/* Define where to put the arguments to a function. -+ Value is zero to push the argument on the stack, -+ or a hard register in which to store the argument. -+ -+ MODE is the argument's machine mode. -+ TYPE is the data type of the argument (as a tree). -+ This is null for libcalls where that information may -+ not be available. -+ CUM is a variable of type CUMULATIVE_ARGS which gives info about -+ the preceding args and about the function being called. */ -+ -+static struct rtx_def * -+_m68k_function_arg (CUMULATIVE_ARGS *, machine_mode, const_tree); -+ -+static struct rtx_def * -+_m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) -+{ -+ struct amigaos_args * cum = &mycum; -+ // printf("m68k_function_arg numOfRegs=%p\r\n", cum); -+ -+ if (cump != lastcum) -+ return 0; -+ -+ if (cum->num_of_regs) -+ { -+ int regbegin = -1, altregbegin = -1, len; -+ -+ /* FIXME: The last condition below is a workaround for a bug. */ -+ if (TARGET_68881 && FLOAT_MODE_P(mode) && -+ GET_MODE_UNIT_SIZE (mode) <= 12 -+ && (GET_MODE_CLASS (mode) != MODE_COMPLEX_FLOAT || mode == SCmode)) -+ { -+ regbegin = 16; /* FPx */ -+ len = GET_MODE_NUNITS(mode); -+ } -+ /* FIXME: Two last conditions below are workarounds for bugs. */ -+ else if (INTEGRAL_MODE_P (mode) && mode != CQImode && mode != CHImode) -+ { -+ if (POINTER_TYPE_P(type)) -+ regbegin = 8; /* Ax */ -+ else -+ regbegin = 0; /* Dx */ -+ altregbegin = 8 - regbegin; -+ len = (GET_MODE_SIZE (mode) + (UNITS_PER_WORD - 1)) / UNITS_PER_WORD; -+ } -+ -+ if (regbegin != -1) -+ { -+ int reg; -+ long mask; -+ -+ look_for_reg: mask = 1 << regbegin; -+ for (reg = 0; reg < cum->num_of_regs; reg++, mask <<= 1) -+ if (!(cum->regs_already_used & mask)) -+ { -+ int end; -+ for (end = reg; end < cum->num_of_regs && end < reg + len; -+ end++, mask <<= 1) -+ if (cum->regs_already_used & mask) -+ break; -+ if (end == reg + len) -+ { -+ cum->last_arg_reg = reg + regbegin; -+ cum->last_arg_len = len; -+ break; -+ } -+ } -+ -+ if (reg == cum->num_of_regs && altregbegin != -1) -+ { -+ regbegin = altregbegin; -+ altregbegin = -1; -+ goto look_for_reg; -+ } -+ } -+ -+ if (cum->last_arg_reg != -1) -+ { -+ // printf("-> gen_rtx_REG %d\r\n", cum->last_arg_reg); -+ return gen_rtx_REG (mode, cum->last_arg_reg); -+ } -+ } -+ return 0; -+} -+ -+/* A C expression that controls whether a function argument is passed -+ in a register, and which register. */ -+ -+struct rtx_def * -+amigaos_function_arg (cumulative_args_t cum_v, machine_mode mode, -+ const_tree type, bool) -+{ -+ struct amigaos_args * cum = &mycum; -+ -+ // printf("amigaos_function_arg %p\r\n", cum_v.p); fflush(stdout); -+ -+ CUMULATIVE_ARGS *cump = (CUMULATIVE_ARGS *) get_cumulative_args (cum_v); -+ -+ if (cump != lastcum) -+ return 0; -+ -+ tree asmtree = type ? TYPE_ATTRIBUTES(type) : NULL_TREE; -+ if (asmtree && 0 == strcmp ("asm", IDENTIFIER_POINTER(TREE_PURPOSE(asmtree)))) -+ { -+ int i; -+ cum->last_arg_reg = TREE_FIXED_CST_PTR(TREE_VALUE(asmtree))->data.low; -+ cum->last_arg_len = HARD_REGNO_NREGS(cum->last_arg_reg, mode); -+ -+ for (i = 0; i < cum->last_arg_len; i++) -+ if (cum->regs_already_used & (1 << (cum->last_arg_reg + i))) -+ { -+ error ("two parameters allocated for one register"); -+ break; -+ } -+ return gen_rtx_REG (mode, cum->last_arg_reg); -+ } -+ return _m68k_function_arg (cump, mode, type); -+} -+ -+/* Return zero if the attributes on TYPE1 and TYPE2 are incompatible, -+ one if they are compatible, and two if they are nearly compatible -+ (which causes a warning to be generated). */ -+ -+int -+amigaos_comp_type_attributes (const_tree type1, const_tree type2) -+{ -+ printf("amigaos_comp_type_attributes\n"); -+ /* Functions or methods are incompatible if they specify mutually exclusive -+ ways of passing arguments. */ -+ if (TREE_CODE(type1) == FUNCTION_TYPE || TREE_CODE(type1) == METHOD_TYPE) -+ { -+ tree arg1, arg2; -+ arg1 = TYPE_ARG_TYPES(type1); -+ arg2 = TYPE_ARG_TYPES(type2); -+ for (; arg1 && arg2; arg1 = TREE_CHAIN(arg1), arg2 = TREE_CHAIN(arg2)) -+ { -+ tree attr1 = TYPE_ATTRIBUTES(arg1); -+ tree attr2 = TYPE_ATTRIBUTES(arg2); -+ if (strcmp ("asm", IDENTIFIER_POINTER(TREE_PURPOSE(attr1)))) -+ attr1 = NULL_TREE; -+ if (strcmp ("asm", IDENTIFIER_POINTER(TREE_PURPOSE(attr2)))) -+ attr2 = NULL_TREE; -+ if (attr1 && attr2) -+ { -+ if (TREE_FIXED_CST_PTR(TREE_VALUE(attr1))->data.low -+ != TREE_FIXED_CST_PTR(TREE_VALUE(attr2))->data.low) -+ return 0; -+ } -+ else if (attr1 || attr2) -+ return 0; /* asm attribute only on one side. */ -+ } -+ if (arg1 || arg2) -+ return 0; /* different count of parameters. */ -+ } -+ return 1; -+} -+ -+/* Return zero if the attributes on TYPE1 and TYPE2 are incompatible, -+ one if they are compatible, and two if they are nearly compatible -+ (which causes a warning to be generated). */ -+#if 0 -+static int -+m68k_comp_type_attributes (tree type1, tree type2) -+{ -+ -+ /* Functions or methods are incompatible if they specify mutually -+ exclusive ways of passing arguments. */ -+ if (TREE_CODE (type1) == FUNCTION_TYPE || TREE_CODE (type1) == METHOD_TYPE) -+ { -+ tree arg1, arg2; -+ if (!! lookup_attribute ("stkparm", TYPE_ATTRIBUTES (type1)) != -+ !! lookup_attribute ("stkparm", TYPE_ATTRIBUTES (type2)) -+ || !! lookup_attribute ("regparm", TYPE_ATTRIBUTES (type1)) != -+ !! lookup_attribute ("regparm", TYPE_ATTRIBUTES (type2))) -+ return 0; /* 'regparm' and 'stkparm' are mutually exclusive. */ -+ -+ arg1 = lookup_attribute ("regparm", TYPE_ATTRIBUTES (type1)); -+ arg2 = lookup_attribute ("regparm", TYPE_ATTRIBUTES (type2)); -+ if (arg1 && arg2) -+ { -+ int num1 = 0, num2 = 0; -+ if (TREE_VALUE (arg1) && TREE_CODE (TREE_VALUE (arg1)) == TREE_LIST) -+ { -+ tree numofregs = TREE_VALUE (TREE_VALUE (arg1)); -+ if (numofregs) -+ num1 = TREE_INT_CST_LOW (numofregs); -+ } -+ if (TREE_VALUE (arg2) && TREE_CODE (TREE_VALUE (arg2)) == TREE_LIST) -+ { -+ tree numofregs = TREE_VALUE (TREE_VALUE (arg2)); -+ if (numofregs) -+ num2 = TREE_INT_CST_LOW (numofregs); -+ } -+ if (num1 != num2) -+ return 0; /* Different numbers, or no number in one type. */ -+ } -+ } -+#ifdef TARGET_AMIGAOS -+ return amigaos_comp_type_attributes(type1, type2); -+#else -+ return 1; -+#endif -+} -+#endif -+ -+/* end-GG-local */ -+ -+ -+/* Handle a "regparm", "stkparm" attribute; -+ arguments as in struct attribute_spec.handler. */ -+tree -+amigaos_handle_type_attribute (tree *node, tree name, tree args, -+ int flags ATTRIBUTE_UNUSED, bool *no_add_attrs) -+{ -+ tree nnn = *node; -+ do { // while (0); -+// printf("%p with treecode %d\n", node, TREE_CODE(nnn)); fflush(stdout); -+ if (TREE_CODE (nnn) == FUNCTION_DECL || TREE_CODE (nnn) == FUNCTION_TYPE -+ || TREE_CODE (nnn) == METHOD_TYPE) -+ { -+ /* 'regparm' accepts one optional argument - number of registers in -+ single class that should be used to pass arguments. */ -+ if (is_attribute_p ("regparm", name)) -+ { -+// printf ("regparm found\n"); fflush(stdout); -+ -+ if (lookup_attribute ("stkparm", TYPE_ATTRIBUTES(nnn))) -+ { -+ error ("`regparm' and `stkparm' are mutually exclusive"); -+ break; -+ } -+ if (args && TREE_CODE (args) == TREE_LIST) -+ { -+ tree val = TREE_VALUE(args); -+// printf ("regparm with val: %d\n", TREE_CODE(val)); -+ if (TREE_CODE (val) == INTEGER_CST) -+ { -+ int no = TREE_INT_CST_LOW(val); -+ if (no < 0 || no > AMIGAOS_MAX_REGPARM) -+ { -+ error ("`regparm' attribute: value %d not in [0 - %d]", -+ no, -+ AMIGAOS_MAX_REGPARM); -+ break; -+ } -+ } -+ else -+ { -+ error ("invalid argument(s) to `regparm' attribute"); -+ break; -+ } -+ } -+ } -+ else if (is_attribute_p ("stkparm", name)) -+ { -+ if (lookup_attribute ("regparm", TYPE_ATTRIBUTES(nnn))) -+ { -+ error ("`regparm' and `stkparm' are mutually exclusive"); -+ break; -+ } -+ } -+ else if (is_attribute_p ("stackext", name)) -+ { -+ if (lookup_attribute ("interrupt", TYPE_ATTRIBUTES(nnn))) -+ { -+ error ("`stackext' and `interrupt' are mutually exclusive"); -+ break; -+ } -+ } -+ else if (is_attribute_p ("saveds", name)) -+ { -+ } -+ } -+ else -+ { -+ warning (OPT_Wattributes, "`%s' attribute only applies to functions", -+ IDENTIFIER_POINTER(name)); -+ } -+ return NULL_TREE; -+ } while (0); -+ // error case -+ *no_add_attrs = true; -+ return NULL_TREE; -+} -+ -+ -+extern bool -+m68k_rtx_costs (rtx, machine_mode, int, int, int *, bool); -+ -+bool -+amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, -+ int *total, bool speed) -+{ -+// printf("outer: %d, opno: %d", outer_code, opno); fflush(stdout); -+// debug_rtx(x); -+ bool r = m68k_rtx_costs (x, mode, outer_code, opno, total, speed); -+ *total *= 4; -+ return r; -+} -+ -+ -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -new file mode 100755 -index 000000000000..1a33225ab60f ---- /dev/null -+++ gcc/config/m68k/amigaos.h -@@ -0,0 +1,490 @@ -+/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. -+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 -+ Free Software Foundation, Inc. -+ Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). -+ Heavily modified by Kamil Iskra (iskra(a)student.uci.agh.edu.pl). -+ -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+#ifndef TARGET_AMIGAOS -+#define TARGET_AMIGAOS 1 -+#endif -+ -+#if 0 -+/* The function name __transfer_from_trampoline is not actually used. -+ The function definition just permits use of asm with operands" -+ (though the operand list is empty). */ -+ -+#undef TRANSFER_FROM_TRAMPOLINE -+ -+/* Call __flush_cache() after building the trampoline: it will call -+ an appropriate OS cache-clearing routine. */ -+ -+#undef FINALIZE_TRAMPOLINE -+#define FINALIZE_TRAMPOLINE(TRAMP) \ -+ emit_library_call (gen_rtx_SYMBOL_REF (Pmode, "__flush_cache"), \ -+ 0, VOIDmode, 2, (TRAMP), Pmode, \ -+ GEN_INT (TRAMPOLINE_SIZE), SImode) -+ -+#endif -+ -+/* Compile using the first 'm68k_regparm' data, address and float -+ registers for arguments passing. */ -+/*#define SUBTARGET_OPTIONS { "regparm=", &m68k_regparm_string, \ -+ N_("Use this register count to pass arguments"), 0},*/ -+ -+ -+/* Nonzero if we need to generate special stack-allocating insns. -+ On most systems they are not needed. -+ When they are needed, also define ALTERNATE_ALLOCATE_STACK (see m68k.md) -+ to perform the necessary actions. */ -+//#undef TARGET_ALTERNATE_ALLOCATE_STACK -+//#define TARGET_ALTERNATE_ALLOCATE_STACK 0 -+ -+ -+/* Compile with stack extension. */ -+ -+#define MASK_STACKEXTEND 0x40000000 /* 1 << 30 */ -+#define TARGET_STACKEXTEND (((target_flags & MASK_STACKEXTEND) \ -+ && !lookup_attribute ("interrupt", \ -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) \ -+ || lookup_attribute ("stackext", \ -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) -+ -+///* Compile with stack checking. */ -+// -+#define MASK_STACKCHECK 0x20000000 /* 1 << 29 */ -+#define TARGET_STACKCHECK ((target_flags & MASK_STACKCHECK) \ -+ && !(target_flags & MASK_STACKEXTEND) \ -+ && !lookup_attribute ("interrupt", \ -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl))) \ -+ && !lookup_attribute ("stackext", \ -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) -+ -+/* Compile with a4 restoring in public functions. */ -+ -+#define MASK_RESTORE_A4 0x10000000 /* 1 << 28 */ -+#define TARGET_RESTORE_A4 \ -+ ((target_flags & MASK_RESTORE_A4) && TREE_PUBLIC (current_function_decl)) -+ -+/* Compile with a4 restoring in all functions. */ -+ -+#define MASK_ALWAYS_RESTORE_A4 0x8000000 /* 1 << 27 */ -+#define TARGET_ALWAYS_RESTORE_A4 (target_flags & MASK_ALWAYS_RESTORE_A4) -+ -+/* Provide a dummy entry for the '-msmall-code' switch. This is used by -+ the assembler and '*_SPEC'. */ -+ -+#undef SUBTARGET_SWITCHES -+#define SUBTARGET_SWITCHES \ -+ { "small-code", 0, \ -+ "" /* Undocumented. */ }, \ -+ { "stackcheck", MASK_STACKCHECK, \ -+ N_("Generate stack-check code") }, \ -+ { "no-stackcheck", - MASK_STACKCHECK, \ -+ N_("Do not generate stack-check code") }, \ -+ { "stackextend", MASK_STACKEXTEND, \ -+ N_("Generate stack-extension code") }, \ -+ { "no-stackextend", - MASK_STACKEXTEND, \ -+ N_("Do not generate stack-extension code") }, \ -+ { "fixedstack", - (MASK_STACKCHECK|MASK_STACKEXTEND), \ -+ N_("Do not generate stack-check/stack-extension code") }, \ -+ { "restore-a4", MASK_RESTORE_A4, \ -+ N_("Restore a4 in public functions") }, \ -+ { "no-restore-a4", - MASK_RESTORE_A4, \ -+ N_("Do not restore a4 in public functions") }, \ -+ { "always-restore-a4", MASK_ALWAYS_RESTORE_A4, \ -+ N_("Restore a4 in all functions") }, \ -+ { "no-always-restore-a4", - MASK_ALWAYS_RESTORE_A4, \ -+ N_("Do not restore a4 in all functions") } -+ -+#if 0 -+/* Various ABI issues. */ -+ -+/* This is (almost;-) BSD, so it wants DBX format. */ -+#undef DBX_DEBUGGING_INFO -+#define DBX_DEBUGGING_INFO -+ -+/* GDB goes mad if it sees the function end marker. */ -+ -+#define NO_DBX_FUNCTION_END 1 -+ -+/* Allow folding division by zero. */ -+ -+#define REAL_INFINITY -+ -+/* Don't try using XFmode since we don't have appropriate runtime software -+ support. */ -+#undef LONG_DOUBLE_TYPE_SIZE -+#define LONG_DOUBLE_TYPE_SIZE 64 -+ -+/* We use A4 for the PIC pointer, not A5, which is the framepointer. */ -+ -+#undef PIC_OFFSET_TABLE_REGNUM -+#define PIC_OFFSET_TABLE_REGNUM (flag_pic ? 12 : INVALID_REGNUM) -+ -+#undef PIC_REG -+#define PIC_REG 12 -+ -+/* Use A5 as framepointer instead of A6, since the AmigaOS ABI requires A6 -+ to be used as a shared library base pointer in direct library calls. */ -+ -+#undef FRAME_POINTER_REGNUM -+#define FRAME_POINTER_REGNUM 13 -+ -+#undef M68K_REGNAME -+#define M68K_REGNAME(r) ( \ -+ ( ((r) == FRAME_POINTER_REGNUM) \ -+ && frame_pointer_needed) ? \ -+ M68K_FP_REG_NAME : reg_names[(r)]) -+ -+ -+/* The AmigaOS ABI does not define how structures should be returned, so, -+ contrary to 'm68k.h', we prefer a multithread-safe solution. */ -+ -+#undef PCC_STATIC_STRUCT_RETURN -+ -+/* Setup a default shell return value for those (gazillion..) programs that -+ (inspite of ANSI-C) declare main() to be void (or even VOID...) and thus -+ cause the shell to randomly caugh upon executing such programs (contrary -+ to Unix, AmigaOS scripts are terminated with an error if a program returns -+ with an error code above the `error' or even `failure' level -+ (which is configurable with the FAILAT command)). */ -+ -+//+2004-06-24 Ulrich Weigand <uweigand(a)de.ibm.com> -+//+ -+//+ * c-decl.c (finish_function): Do not check for DEFAULT_MAIN_RETURN. -+//+ * system.h (DEFAULT_MAIN_RETURN): Poison. -+//+ * doc/tm.texi (DEFAULT_MAIN_RETURN): Remove documentation. -+//+ -+ -+//poison VAR -+//#define DEFAULT_MAIN_RETURN c_expand_return (integer_zero_node) -+ -+#undef WCHAR_TYPE -+#define WCHAR_TYPE "unsigned int" -+ -+/* XXX: section support */ -+#if 0 -+/* Support sections in chip memory, currently '.datachip' only. */ -+#undef TARGET_ASM_NAMED_SECTION -+#define TARGET_ASM_NAMED_SECTION amiga_named_section -+ -+/* We define TARGET_ASM_NAMED_SECTION, but we don't support arbitrary sections, -+ including '.gcc_except_table', so we emulate the standard behaviour. */ -+#undef TARGET_ASM_EXCEPTION_SECTION -+#define TARGET_ASM_EXCEPTION_SECTION amiga_exception_section -+ -+#undef TARGET_ASM_EH_FRAME_SECTION -+#define TARGET_ASM_EH_FRAME_SECTION amiga_eh_frame_section -+#endif -+ -+/* Use sjlj exceptions because dwarf work only on elf targets */ -+#undef DWARF2_UNWIND_INFO -+#define DWARF2_UNWIND_INFO 0 -+ -+ -+/* This is how to output an assembler line that says to advance the -+ location counter to a multiple of 2**LOG bytes. */ -+ -+#ifndef ALIGN_ASM_OP -+#define ALIGN_ASM_OP "\t.align\t" -+#endif -+ -+/* GAS supports alignment up to 32768 bytes. */ -+#undef ASM_OUTPUT_ALIGN -+#define ASM_OUTPUT_ALIGN(FILE, LOG) \ -+do \ -+ { \ -+ if ((LOG) == 1) \ -+ fprintf ((FILE), "\t.even\n"); \ -+ else \ -+ fprintf ((FILE), "\t.align %d\n", (LOG)); \ -+ } \ -+while (0) -+ -+/* Baserel support. */ -+ -+/* Given that symbolic_operand(X), return TRUE if no special -+ base relative relocation is necessary */ -+ -+#define LEGITIMATE_BASEREL_OPERAND_P(X) \ -+ (flag_pic >= 3 && read_only_operand (X)) -+ -+#undef LEGITIMATE_PIC_OPERAND_P -+#define LEGITIMATE_PIC_OPERAND_P(X) \ -+ (! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X)) -+ -+/* Define this macro if references to a symbol must be treated -+ differently depending on something about the variable or -+ function named by the symbol (such as what section it is in). -+ -+ The macro definition, if any, is executed immediately after the -+ rtl for DECL or other node is created. -+ The value of the rtl will be a `mem' whose address is a -+ `symbol_ref'. -+ -+ The usual thing for this macro to do is to a flag in the -+ `symbol_ref' (such as `SYMBOL_REF_FLAG') or to store a modified -+ name string in the `symbol_ref' (if one bit is not enough -+ information). -+ -+ On the Amiga we use this to indicate if references to a symbol should be -+ absolute or base relative. */ -+ -+#undef TARGET_ENCODE_SECTION_INFO -+#define TARGET_ENCODE_SECTION_INFO amigaos_encode_section_info -+ -+#define LIBCALL_ENCODE_SECTION_INFO(FUN) \ -+do \ -+ { \ -+ if (flag_pic >= 3) \ -+ SYMBOL_REF_FLAG (FUN) = 1; \ -+ } \ -+while (0) -+ -+/* Select and switch to a section for EXP. */ -+ -+//#undef TARGET_ASM_SELECT_SECTION -+//#define TARGET_ASM_SELECT_SECTION amigaos_select_section -+ -+/* Preserve A4 for baserel code if necessary. */ -+ -+#define EXTRA_SAVE_REG(REGNO) \ -+do { \ -+ if (flag_pic && flag_pic >= 3 && REGNO == PIC_OFFSET_TABLE_REGNUM \ -+ && amigaos_restore_a4()) \ -+ return true; \ -+} while (0) -+ -+/* Predicate for ALTERNATE_PIC_SETUP. */ -+ -+#define HAVE_ALTERNATE_PIC_SETUP (flag_pic >= 3) -+ -+/* Make a4 point at data hunk. */ -+ -+#define ALTERNATE_PIC_SETUP(STREAM) \ -+ (amigaos_alternate_pic_setup (STREAM)) -+ -+/* Attribute support. */ -+ -+/* Generate the test of d0 before return to set cc register in 'interrupt' -+ function. */ -+ -+#define EPILOGUE_END_HOOK(STREAM) \ -+do \ -+ { \ -+ if (lookup_attribute ("interrupt", \ -+ TYPE_ATTRIBUTES (TREE_TYPE (current_function_decl)))) \ -+ asm_fprintf ((STREAM), "\ttstl %Rd0\n"); \ -+ } \ -+while (0) -+ -+ -+/* Stack checking and automatic extension support. */ -+ -+#define PROLOGUE_BEGIN_HOOK(STREAM, FSIZE) \ -+ (amigaos_prologue_begin_hook ((STREAM), (FSIZE))) -+ -+#define HAVE_ALTERNATE_FRAME_SETUP_F(FSIZE) TARGET_STACKEXTEND -+ -+#define ALTERNATE_FRAME_SETUP_F(STREAM, FSIZE) \ -+ (amigaos_alternate_frame_setup_f ((STREAM), (FSIZE))) -+ -+#define HAVE_ALTERNATE_FRAME_SETUP(FSIZE) TARGET_STACKEXTEND -+ -+#define ALTERNATE_FRAME_SETUP(STREAM, FSIZE) \ -+ (amigaos_alternate_frame_setup ((STREAM), (FSIZE))) -+ -+#define HAVE_ALTERNATE_FRAME_DESTR_F(FSIZE) \ -+ (TARGET_STACKEXTEND && current_function_calls_alloca) -+ -+#define ALTERNATE_FRAME_DESTR_F(STREAM, FSIZE) \ -+ (asm_fprintf ((STREAM), "\tjra %U__unlk_a5_rts\n")) -+ -+#define HAVE_ALTERNATE_RETURN \ -+ (TARGET_STACKEXTEND && frame_pointer_needed && \ -+ current_function_calls_alloca) -+ -+#define ALTERNATE_RETURN(STREAM) -+ -+#if 0 -+#define HAVE_restore_stack_nonlocal TARGET_STACKEXTEND -+#define gen_restore_stack_nonlocal gen_stack_cleanup_call -+ -+#define HAVE_restore_stack_function TARGET_STACKEXTEND -+#define gen_restore_stack_function gen_stack_cleanup_call -+ -+#define HAVE_restore_stack_block TARGET_STACKEXTEND -+#define gen_restore_stack_block gen_stack_cleanup_call -+ -+#undef TARGET_ALTERNATE_ALLOCATE_STACK -+#define TARGET_ALTERNATE_ALLOCATE_STACK 1 -+ -+#define ALTERNATE_ALLOCATE_STACK(OPERANDS) \ -+do \ -+ { \ -+ amigaos_alternate_allocate_stack (OPERANDS); \ -+ DONE; \ -+ } \ -+while (0) -+#endif -+ -+/* begin-GG-local: dynamic libraries */ -+ -+extern int amigaos_do_collecting (void); -+extern void amigaos_gccopts_hook (const char *); -+extern void amigaos_libname_hook (const char* arg); -+extern void amigaos_collect2_cleanup (void); -+extern void amigaos_prelink_hook (const char **, int *); -+extern void amigaos_postlink_hook (const char *); -+ -+/* This macro is used to check if all collect2 facilities should be used. -+ We need a few special ones, like stripping after linking. */ -+ -+#define DO_COLLECTING (do_collecting || amigaos_do_collecting()) -+#define COLLECT2_POSTLINK_HOOK(OUTPUT_FILE) amigaos_postlink_hook(OUTPUT_FILE) //new -+ -+/* This macro is called in collect2 for every GCC argument name. -+ ARG is a part of commandline (without '\0' at the end). */ -+ -+#define COLLECT2_GCC_OPTIONS_HOOK(ARG) amigaos_gccopts_hook(ARG) -+ -+/* This macro is called in collect2 for every ld's "-l" or "*.o" or "*.a" -+ argument. ARG is a complete argument, with '\0' at the end. */ -+ -+#define COLLECT2_LIBNAME_HOOK(ARG) amigaos_libname_hook(ARG) -+ -+/* This macro is called at collect2 exit, to clean everything up. */ -+ -+#define COLLECT2_EXTRA_CLEANUP amigaos_collect2_cleanup -+ -+/* This macro is called just before the first linker invocation. -+ LD1_ARGV is "char** argv", which will be passed to "ld". STRIP is an -+ *address* of "strip_flag" variable. */ -+ -+#define COLLECT2_PRELINK_HOOK(LD1_ARGV, STRIP) \ -+amigaos_prelink_hook((const char **)(LD1_ARGV), (STRIP)) -+ -+/* This macro is called just after the first linker invocation, in place of -+ "nm" and "ldd". OUTPUT_FILE is the executable's filename. */ -+ -+#define COLLECT2_POSTLINK_HOOK(OUTPUT_FILE) amigaos_postlink_hook(OUTPUT_FILE) -+/* end-GG-local */ -+ -+#endif -+ -+/* begin-GG-local: explicit register specification for parameters */ -+ -+/* Note: this is an extension of m68k_args */ -+ -+ -+/* A C type for declaring a variable that is used as the first -+ argument of `FUNCTION_ARG' and other related values. */ -+/* Max. number of data, address and float registers to be used for passing -+ integer, pointer and float arguments when TARGET_REGPARM. -+ It's 4, so d0-d3, a0-a3 and fp0-fp3 can be used. */ -+#undef AMIGAOS_MAX_REGPARM -+#define AMIGAOS_MAX_REGPARM 4 -+ -+/* The default number of data, address and float registers to use when -+ user specified '-mregparm' switch, not '-mregparm=<value>' option. */ -+#undef AMIGAOS_DEFAULT_REGPARM -+#define AMIGAOS_DEFAULT_REGPARM 2 -+ -+ -+#undef CLASS_MAX_NREGS -+#define CLASS_MAX_NREGS(CLASS, MODE) \ -+ ((CLASS) == FP_REGS ? GET_MODE_NUNITS (MODE) \ -+ : ((GET_MODE_SIZE (MODE) + UNITS_PER_WORD - 1) / UNITS_PER_WORD)) -+ -+/* 1 if N is a possible register number for function argument passing. */ -+#undef FUNCTION_ARG_REGNO_P -+#define FUNCTION_ARG_REGNO_P(N) \ -+ ((((int)N) >= 0 && (N) < AMIGAOS_MAX_REGPARM) \ -+ || ((N) >= 8 && (N) < 8 + AMIGAOS_MAX_REGPARM) \ -+ || (TARGET_68881 && (N) >= 16 && (N) < 16 + AMIGAOS_MAX_REGPARM)) -+ -+/* -+ On the m68k, this is a structure: -+ num_of_regs: number of data, address and float registers to use for -+ arguments passing (if it's 2, than pass arguments in d0, d1, a0, a1, -+ fp0 and fp1). 0 - pass everything on stack. vararg calls are -+ always passed entirely on stack. -+ regs_already_used: bitmask of the already used registers. -+ last_arg_reg - register number of the most recently passed argument. -+ -1 if passed on stack. -+ last_arg_len - number of registers used by the most recently passed -+ argument. -+*/ -+ -+extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *cum, tree); -+extern void amigaos_function_arg_advance (cumulative_args_t, machine_mode, const_tree, bool); -+extern rtx amigaos_function_arg (cumulative_args_t, machine_mode, const_tree, bool); -+extern cumulative_args_t amigaos_pack_cumulative_args (CUMULATIVE_ARGS *); -+extern int amigaos_comp_type_attributes (const_tree, const_tree); -+extern tree amigaos_handle_type_attribute(tree *, tree, tree, int, bool*); -+ -+/* Update the data in CUM to advance over an argument -+ of mode MODE and data type TYPE. -+ (TYPE is null for libcalls where that information may not be available.) */ -+ -+#undef TARGET_FUNCTION_ARG_ADVANCE -+#define TARGET_FUNCTION_ARG_ADVANCE amigaos_function_arg_advance -+ -+/* A C expression that controls whether a function argument is passed -+ in a register, and which register. */ -+ -+#undef TARGET_FUNCTION_ARG -+#define TARGET_FUNCTION_ARG amigaos_function_arg -+ -+#undef TARGET_PACK_CUMULATIVE_ARGS -+#define TARGET_PACK_CUMULATIVE_ARGS(CUM) \ -+ (amigaos_pack_cumulative_args(&(CUM))) -+ -+#undef TARGET_COMP_TYPE_ATTRIBUTES -+#define TARGET_COMP_TYPE_ATTRIBUTES amigaos_comp_type_attributes -+ -+ -+/* end-GG-local */ -+ -+#undef SUBTARGET_OVERRIDE_OPTIONS -+#define SUBTARGET_OVERRIDE_OPTIONS \ -+do \ -+ { \ -+ if (!TARGET_68020 && flag_pic==4) \ -+ error ("-fbaserel32 is not supported on the 68000 or 68010\n"); \ -+ if (amigaos_regparm > 0 && amigaos_regparm > AMIGAOS_MAX_REGPARM) \ -+ error ("-mregparm=x with 1 <= x <= %d\n", AMIGAOS_MAX_REGPARM); \ -+ } \ -+while (0) -+ -+/* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, -+ affects_type_identity } */ -+#define SUBTARGET_ATTRIBUTES \ -+ { "regparm", 1, 1, true, false, false, amigaos_handle_type_attribute,\ -+ false }, -+ -+#define GOT_SYMBOL_NAME "" -+ -+#undef TARGET_RTX_COSTS -+#define TARGET_RTX_COSTS amigaos_rtx_costs -+bool -+amigaos_rtx_costs (rtx, machine_mode, int, int, int *, bool); -+ -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -new file mode 100755 -index 000000000000..a9bc80c4f5b6 ---- /dev/null -+++ gcc/config/m68k/amigaos.opt -@@ -0,0 +1,13 @@ -+ -+mregparm= -+Target RejectNegative Var(amigaos_regparm) Joined UInteger -+Pass arguments through registers. -+ -+noixemul -+Target RejectNegative -+Do not use ixemul.library - use libnix instead to link -+ -+msmall-code -+Target RejectNegative -+small code model -+ -diff --git a/gcc/config/m68k/host-amigaos.c b/gcc/config/m68k/host-amigaos.c -new file mode 100755 -index 000000000000..8c72d516a378 ---- /dev/null -+++ gcc/config/m68k/host-amigaos.c -@@ -0,0 +1,42 @@ -+/* AmigaOS/m68k host-specific hook definitions. -+ Copyright (C) 2003 Free Software Foundation, Inc. -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify it under -+the terms of the GNU General Public License as published by the Free -+Software Foundation; either version 2, or (at your option) any later -+version. -+ -+GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+WARRANTY; without even the implied warranty of MERCHANTABILITY or -+FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to the Free -+Software Foundation, 59 Temple Place - Suite 330, Boston, MA -+02111-1307, USA. */ -+ -+ -+#include "config.h" -+#include "system.h" -+#include "coretypes.h" -+#include "hosthooks.h" -+#include "hosthooks-def.h" -+#include "toplev.h" -+ -+static void * amigaos_m68k_gt_pch_get_address (size_t); -+ -+/* Return the address of the PCH address space, if the PCH will fit in it. */ -+ -+static void * -+amigaos_m68k_gt_pch_get_address (size_t sz ATTRIBUTE_UNUSED) -+{ -+ fatal_error ("PCH not supported\n"); -+} -+ -+#undef HOST_HOOKS_GT_PCH_GET_ADDRESS -+#define HOST_HOOKS_GT_PCH_GET_ADDRESS amigaos_m68k_gt_pch_get_address -+ -+const struct host_hooks host_hooks = HOST_HOOKS_INITIALIZER; -\ No newline at end of file -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index 03f474e1b63c..fe3a939e1530 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -166,7 +166,10 @@ static bool m68k_save_reg (unsigned int regno, bool interrupt_handler); - static bool m68k_ok_for_sibcall_p (tree, tree); - static bool m68k_tls_symbol_p (rtx); - static rtx m68k_legitimize_address (rtx, rtx, machine_mode); --static bool m68k_rtx_costs (rtx, machine_mode, int, int, int *, bool); -+#ifndef TARGET_AMIGAOS -+static -+#endif -+bool m68k_rtx_costs (rtx, machine_mode, int, int, int *, bool); - #if M68K_HONOR_TARGET_STRICT_ALIGNMENT - static bool m68k_return_in_memory (const_tree, const_tree); - #endif -@@ -174,10 +177,12 @@ static void m68k_output_dwarf_dtprel (FILE *, int, rtx) ATTRIBUTE_UNUSED; - static void m68k_trampoline_init (rtx, tree, rtx); - static int m68k_return_pops_args (tree, tree, int); - static rtx m68k_delegitimize_address (rtx); -+#ifndef TARGET_AMIGA - static void m68k_function_arg_advance (cumulative_args_t, machine_mode, - const_tree, bool); - static rtx m68k_function_arg (cumulative_args_t, machine_mode, - const_tree, bool); -+#endif - static bool m68k_cannot_force_const_mem (machine_mode mode, rtx x); - static bool m68k_output_addr_const_extra (FILE *, rtx); - static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; -@@ -322,6 +327,10 @@ static void m68k_init_sync_libfuncs (void) ATTRIBUTE_UNUSED; - #undef TARGET_ATOMIC_TEST_AND_SET_TRUEVAL - #define TARGET_ATOMIC_TEST_AND_SET_TRUEVAL 128 - -+#ifdef TARGET_AMIGA -+#include "amigaos.h" -+#endif -+ - static const struct attribute_spec m68k_attribute_table[] = - { - /* { name, min_len, max_len, decl_req, type_req, fn_type_req, handler, -@@ -332,6 +341,9 @@ static const struct attribute_spec m68k_attribute_table[] = - m68k_handle_fndecl_attribute, false }, - { "interrupt_thread", 0, 0, true, false, false, - m68k_handle_fndecl_attribute, false }, -+#ifdef SUBTARGET_ATTRIBUTES -+ SUBTARGET_ATTRIBUTES -+#endif - { NULL, 0, 0, false, false, false, NULL, false } - }; - -@@ -1419,6 +1431,7 @@ m68k_ok_for_sibcall_p (tree decl, tree exp) - return false; - } - -+#ifndef TARGET_AMIGA - /* On the m68k all args are always pushed. */ - - static rtx -@@ -1440,6 +1453,7 @@ m68k_function_arg_advance (cumulative_args_t cum_v, machine_mode mode, - ? (GET_MODE_SIZE (mode) + 3) & ~3 - : (int_size_in_bytes (type) + 3) & ~3); - } -+#endif - - /* Convert X to a legitimate function call memory reference and return the - result. */ -@@ -2172,6 +2186,8 @@ m68k_get_gp (void) - if (pic_offset_table_rtx == NULL_RTX) - pic_offset_table_rtx = gen_rtx_REG (Pmode, PIC_REG); - -+// debug_rtx(pic_offset_table_rtx); -+ - crtl->uses_pic_offset_table = 1; - - return pic_offset_table_rtx; -@@ -2442,9 +2458,9 @@ legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, - if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF) - { - gcc_assert (reg); -- - pic_ref = m68k_wrap_symbol_into_got_ref (orig, RELOC_GOT, reg); - pic_ref = m68k_move_to_reg (pic_ref, orig, reg); -+// debug_rtx(pic_ref); - } - else if (GET_CODE (orig) == CONST) - { -@@ -2787,7 +2803,10 @@ const_int_cost (HOST_WIDE_INT i) - } - } - --static bool -+#ifndef TARGET_AMIGAOS -+static -+#endif -+bool - m68k_rtx_costs (rtx x, machine_mode mode, int outer_code, - int opno ATTRIBUTE_UNUSED, - int *total, bool speed ATTRIBUTE_UNUSED) -@@ -4424,6 +4443,7 @@ floating_exact_log2 (rtx x) - void - print_operand (FILE *file, rtx op, int letter) - { -+// printf("letter: %c\n", letter); - if (letter == '.') - { - if (MOTOROLA) -@@ -4521,7 +4541,9 @@ m68k_get_reloc_decoration (enum m68k_reloc reloc) - switch (reloc) - { - case RELOC_GOT: -- if (MOTOROLA) -+ if (TARGET_AMIGAOS) -+ return ""; -+ else if (MOTOROLA) - { - if (flag_pic == 1 && TARGET_68020) - return "@GOT.w"; -diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h -index 2aa858fa23b5..74d5aa042059 100644 ---- gcc/config/m68k/m68k.h -+++ gcc/config/m68k/m68k.h -@@ -971,3 +971,8 @@ extern int m68k_sched_address_bypass_p (rtx_insn *, rtx_insn *); - extern int m68k_sched_indexed_address_bypass_p (rtx_insn *, rtx_insn *); - - #define CPU_UNITS_QUERY 1 -+ -+#if 1 -+extern void default_stabs_asm_out_constructor (rtx, int); -+extern void default_stabs_asm_out_destructor (rtx, int); -+#endif -diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md -index ec37bd76f55f..f5b63f43c372 100644 ---- gcc/config/m68k/m68k.md -+++ gcc/config/m68k/m68k.md -@@ -7092,6 +7092,8 @@ - operands[1] = gen_rtx_REG (Pmode, PIC_REG); - return MOTOROLA ? "move.l %?(%1),%0" : "movel %1@(%?), %0"; - } -+ else if (TARGET_AMIGAOS) -+ return "lea (%%pc, __GLOBAL_OFFSET_TABLE_), %0"; - else if (MOTOROLA) - { - if (TARGET_COLDFIRE) -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -new file mode 100755 -index 000000000000..0ce599138c7d ---- /dev/null -+++ gcc/config/m68k/m68kamigaos.h -@@ -0,0 +1,424 @@ -+/* m68kelf support, derived from m68kv4.h */ -+ -+/* Target definitions for GNU compiler for mc680x0 running AmigaOs -+ Copyright (C) 1991-2016 Free Software Foundation, Inc. -+ -+ Written by Ron Guilmette (rfg(a)netcom.com) and Fred Fish (fnf(a)cygnus.com). -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 3, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING3. If not see -+<http://www.gnu.org/licenses/>. */ -+ -+#ifndef TARGET_AMIGA -+#define TARGET_AMIGA 1 -+#endif -+ -+#ifndef SWBEG_ASM_OP -+#define SWBEG_ASM_OP "\t.swbeg\t" -+#endif -+ -+#undef PIC_REG -+#define PIC_REG 12 -+ -+#undef FRAME_POINTER_REGNUM -+#define FRAME_POINTER_REGNUM 13 -+ -+#undef M68K_REGNAME -+#define M68K_REGNAME(r) ( \ -+ ( ((r) == FRAME_POINTER_REGNUM) \ -+ && frame_pointer_needed) ? \ -+ M68K_FP_REG_NAME : reg_names[(r)]) -+ -+ -+ -+/* Here are three prefixes that are used by asm_fprintf to -+ facilitate customization for alternate assembler syntaxes. -+ Machines with no likelihood of an alternate syntax need not -+ define these and need not use asm_fprintf. */ -+ -+/* The prefix for register names. Note that REGISTER_NAMES -+ is supposed to include this prefix. Also note that this is NOT an -+ fprintf format string, it is a literal string */ -+ -+#undef REGISTER_PREFIX -+#define REGISTER_PREFIX "" -+ -+/* The prefix for local (compiler generated) labels. -+ These labels will not appear in the symbol table. */ -+ -+#undef LOCAL_LABEL_PREFIX -+#define LOCAL_LABEL_PREFIX "." -+ -+/* The prefix to add to user-visible assembler symbols. */ -+ -+#undef USER_LABEL_PREFIX -+#define USER_LABEL_PREFIX "_" -+ -+/* config/m68k.md has an explicit reference to the program counter, -+ prefix this by the register prefix. */ -+ -+#define ASM_RETURN_CASE_JUMP \ -+ do { \ -+ return "jmp %%pc@(2,%0:w)"; \ -+ } while (0) -+ -+/* This is how to output an assembler line that says to advance the -+ location counter to a multiple of 2**LOG bytes. */ -+ -+#ifndef ALIGN_ASM_OP -+#define ALIGN_ASM_OP "\t.align\t" -+#endif -+ -+#undef ASM_OUTPUT_ALIGN -+#define ASM_OUTPUT_ALIGN(FILE,LOG) \ -+do { \ -+ if ((LOG) > 0) \ -+ fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG)); \ -+} while (0) -+ -+/* Register in which address to store a structure value is passed to a -+ function. The default in m68k.h is a1. For m68k/SVR4 it is a0. */ -+ -+#undef M68K_STRUCT_VALUE_REGNUM -+#define M68K_STRUCT_VALUE_REGNUM A0_REG -+ -+/* The static chain regnum defaults to a0, but we use that for -+ structure return, so have to use a1 for the static chain. */ -+ -+#undef STATIC_CHAIN_REGNUM -+#define STATIC_CHAIN_REGNUM A1_REG -+#undef M68K_STATIC_CHAIN_REG_NAME -+#define M68K_STATIC_CHAIN_REG_NAME REGISTER_PREFIX "a1" -+ -+#define ASM_COMMENT_START "|" -+ -+/* Define how the m68k registers should be numbered for Dwarf output. -+ The numbering provided here should be compatible with the native -+ SVR4 SDB debugger in the m68k/SVR4 reference port, where d0-d7 -+ are 0-7, a0-a8 are 8-15, and fp0-fp7 are 16-23. */ -+ -+#undef DBX_REGISTER_NUMBER -+#define DBX_REGISTER_NUMBER(REGNO) (REGNO) -+ -+#if 0 -+/* SVR4 m68k assembler is bitching on the `comm i,1,1' which askes for -+ 1 byte alignment. Don't generate alignment for COMMON seems to be -+ safer until we the assembler is fixed. */ -+#undef ASM_OUTPUT_ALIGNED_COMMON -+/* Same problem with this one. */ -+#undef ASM_OUTPUT_ALIGNED_LOCAL -+#endif -+ -+#undef ASM_OUTPUT_COMMON -+#undef ASM_OUTPUT_LOCAL -+#define ASM_OUTPUT_COMMON(FILE, NAME, SIZE, ROUNDED) \ -+( fputs (".comm ", (FILE)), \ -+ assemble_name ((FILE), (NAME)), \ -+ fprintf ((FILE), ",%u\n", (int)(SIZE))) -+ -+#define ASM_OUTPUT_LOCAL(FILE, NAME, SIZE, ROUNDED) \ -+( fputs (".lcomm ", (FILE)), \ -+ assemble_name ((FILE), (NAME)), \ -+ fprintf ((FILE), ",%u\n", (int)(SIZE))) -+ -+/* Currently, JUMP_TABLES_IN_TEXT_SECTION must be defined in order to -+ keep switch tables in the text section. */ -+ -+#define JUMP_TABLES_IN_TEXT_SECTION 1 -+ -+/* In m68k svr4, using swbeg is the standard way to do switch -+ table. */ -+#undef ASM_OUTPUT_BEFORE_CASE_LABEL -+#define ASM_OUTPUT_BEFORE_CASE_LABEL(FILE,PREFIX,NUM,TABLE) \ -+ fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1)); -+/* end of stuff from m68kv4.h */ -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC "crtend.o%s" -+ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC "crtbegin.o%s" -+ -+#ifndef BSS_SECTION_ASM_OP -+#define BSS_SECTION_ASM_OP "\t.section\t.bss" -+#endif -+ -+#ifndef ASM_OUTPUT_ALIGNED_BSS -+#define ASM_OUTPUT_ALIGNED_BSS(FILE, DECL, NAME, SIZE, ALIGN) \ -+ asm_output_aligned_bss (FILE, DECL, NAME, SIZE, ALIGN) -+#endif -+ -+ -+/* Specs, switches. */ -+ -+/* amiga/amigaos are the new "standard" defines for the Amiga. -+ MCH_AMIGA, AMIGA, __chip etc. are used in other compilers and are -+ provided for compatibility reasons. -+ When creating shared libraries, use different 'errno'. */ -+ -+ -+ -+#undef TARGET_OS_CPP_BUILTINS -+#define TARGET_OS_CPP_BUILTINS() \ -+ do \ -+ { \ -+ builtin_define ("__chip=__attribute__((__chip__))"); \ -+ builtin_define ("__saveds=__attribute__((__saveds__))"); \ -+ builtin_define ("__interrupt=__attribute__((__interrupt__))"); \ -+ builtin_define ("__stackext=__attribute__((__stackext__))"); \ -+ builtin_define ("__regargs_x=__attribute__((regparm))"); \ -+ builtin_define ("__stdargs_x=__attribute__((stkparm))"); \ -+ builtin_define ("__aligned=__attribute__((__aligned__(4)))"); \ -+ builtin_define_std ("amiga"); \ -+ builtin_define_std ("amigaos"); \ -+ builtin_define_std ("AMIGA"); \ -+ builtin_define_std ("MCH_AMIGA"); \ -+ builtin_assert ("system=amigaos"); \ -+ } \ -+ while (0) -+ -+#if 0 -+if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ -+ builtin_define ("errno=(*ixemul_errno)"); \ -+ -+#endif -+ -+/* Inform the program which CPU we compile for. */ -+ -+//#undef TARGET_CPU_CPP_BUILTINS -+/* -+ use --with-cpu=mc68040 etc.. instead on config. code was after #define TARGET_CPU_CPP_BUILTINS() -+ if (TARGET_68040_ONLY) \ -+ { \ -+ if (TARGET_68060) \ -+ builtin_define_std ("mc68060"); \ -+ else \ -+ builtin_define_std ("mc68040"); \ -+ } \ -+ else if (TARGET_68030 && !TARGET_68040) \ -+ builtin_define_std ("mc68030"); \ -+ else if (TARGET_68020) \ -+ builtin_define_std ("mc68020"); \ -+ builtin_define_std ("mc68000"); \ -+*/ -+/* -+#define TARGET_CPU_CPP_BUILTINS() \ -+ do \ -+ { \ -+ builtin_define_std ("mc68040"); \ -+ if (flag_pic > 2) \ -+ { \ -+ builtin_define ("__pic__"); \ -+ if (flag_pic > 3) \ -+ builtin_define ("__PIC__"); \ -+ } \ -+ builtin_assert ("cpu=m68k"); \ -+ builtin_assert ("machine=m68k"); \ -+ } \ -+ while (0) -+*/ -+/* Define __HAVE_68881__ in preprocessor according to the -m flags. -+ This will control the use of inline 68881 insns in certain macros. -+ Note: it should be set in TARGET_CPU_CPP_BUILTINS but TARGET_68881 -+ isn't the same -m68881 since its also true for -m680[46]0 ... -+ Differentiate between libnix and ixemul. */ -+ -+#define CPP_SPEC \ -+ "%{m68881:-D__HAVE_68881__} " \ -+ "%{!ansi:" \ -+ "%{m68020:-Dmc68020} " \ -+ "%{mc68020:-Dmc68020} " \ -+ "%{m68020-40:-Dmc68020} " \ -+ "%{m68020-60:-Dmc68020} " \ -+ "%{m68030:-Dmc68030} " \ -+ "%{m68040:-Dmc68040} " \ -+ "%{m68060:-Dmc68060}} " \ -+ "%{m68020:-D__mc68020__ -D__mc68020} " \ -+ "%{mc68020:-D__mc68020__ -D__mc68020} " \ -+ "%{m68020-40:-D__mc68020__ -D__mc68020} " \ -+ "%{m68020-60:-D__mc68020__ -D__mc68020} " \ -+ "%{m68030:-D__mc68030__ -D__mc68030} " \ -+ "%{m68040:-D__mc68040__ -D__mc68040} " \ -+ "%{m68060:-D__mc68060__ -D__mc68060} " \ -+ "%{noixemul:%{!ansi:%{!std=*:-Dlibnix}%{std=gnu*:-Dlibnix}} -D__libnix -D__libnix__} " \ -+ "%{!noixemul:%{!ansi:%{!std=*:-Dixemul}%{std=gnu*:-Dixemul}} -D__ixemul -D__ixemul__}" -+ -+/* Translate '-resident' to '-fbaserel' (they differ in linking stage only). -+ Don't put function addresses in registers for PC-relative code. */ -+ -+#define CC1_SPEC \ -+ "%{resident:-fbaserel} " \ -+ "%{resident32:-fbaserel32} " \ -+ "%{msmall-code:-fno-function-cse}" -+ -+/* Various -m flags require special flags to the assembler. */ -+ -+#undef ASM_SPEC -+#define ASM_SPEC \ -+ "%(asm_cpu) %(asm_cpu_default) %{msmall-code:-sc}" -+ -+#undef ASM_CPU_SPEC -+#define ASM_CPU_SPEC \ -+ "%{m68000|mc68000:-m68010} " \ -+ "%{m6802*|mc68020:-m68020} " \ -+ "%{m68030} " \ -+ "%{m68040} " \ -+ "%{m68060}" -+ -+#define ASM_CPU_DEFAULT_SPEC \ -+ "%{!m680*:%{!mc680*:-m68040}}" -+ -+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD -+ compatible debug hunk. -+ Also, pass appropriate linker flavours depending on user-supplied -+ commandline options. */ -+ -+#define LINK_SPEC \ -+ "%{noixemul:-fl libnix} " \ -+ "%{resident*:-amiga-datadata-reloc} " \ -+ "%{resident|fbaserel:-m amiga_bss -fl libb} " \ -+ "%{resident32|fbaserel32:-m amiga_bss -fl libb32} " \ -+ "%{g:-amiga-debug-hunk} " \ -+ "%(link_cpu)" -+ -+#define LINK_CPU_SPEC \ -+ "%{m6802*|mc68020|m68030|m68040|m68060:-fl libm020} " \ -+ "%{m68881:-fl libm881}" -+ -+/* Choose the right startup file, depending on whether we use base relative -+ code, base relative code with automatic relocation (-resident), their -+ 32-bit versions, libnix, profiling or plain crt0.o. */ -+ -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC \ -+ "%{!noixemul:" \ -+ "%{fbaserel:%{!resident:bcrt0.o%s}}" \ -+ "%{resident:rcrt0.o%s}" \ -+ "%{fbaserel32:%{!resident32:lcrt0.o%s}}" \ -+ "%{resident32:scrt0.o%s}" \ -+ "%{!resident:%{!fbaserel:%{!resident32:%{!fbaserel32:" \ -+ "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}}}}" \ -+ "%{noixemul:" \ -+ "%{resident:libnix/nrcrt0.o%s} " \ -+ "%{!resident:%{fbaserel:libnix/nbcrt0.o%s}%{!fbaserel:libnix/ncrt0.o%s}}}" -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC \ -+ "%{noixemul:-lstubs}" -+ -+/* put return values in FPU build in FP0 Reg */ -+#undef FUNCTION_VALUE_REGNO_P -+#define FUNCTION_VALUE_REGNO_P(N) \ -+ ((N) == D0_REG || (N) == A0_REG || (TARGET_68881 && (N) == FP0_REG)) -+ -+ -+/* Automatically search libamiga.a for AmigaOS specific functions. Note -+ that we first search the standard C library to resolve as much as -+ possible from there, since it has names that are duplicated in libamiga.a -+ which we *don't* want from there. Then search libamiga.a for any calls -+ that were not generated inline, and finally search the standard C library -+ again to resolve any references that libamiga.a might have generated. -+ This may only be a temporary solution since it might be better to simply -+ remove the things from libamiga.a that should be pulled in from libc.a -+ instead, which would eliminate the first reference to libc.a. Note that -+ if we don't search it automatically, it is very easy for the user to try -+ to put in a -lamiga himself and get it in the wrong place, so that (for -+ example) calls like sprintf come from -lamiga rather than -lc. */ -+ -+#undef LIB_SPEC -+#define LIB_SPEC \ -+ "%{!noixemul:" \ -+ "%{p|pg:-lc_p}" \ -+ "%{!p:%{!pg:-lc -lamiga -lc}}}" \ -+ "%{noixemul:" \ -+ "-lnixmain -lnix -lamiga %{mstackcheck|mstackextend:-lstack}}" -+ -+/* This macro defines names of additional specifications to put in the specs -+ that can be used in various specifications like CC1_SPEC. Its definition -+ is an initializer with a subgrouping for each command option. -+ -+ Each subgrouping contains a string constant, that defines the -+ specification name, and a string constant that used by the GCC driver -+ program. -+ -+ Do not define this macro if it does not need to do anything. */ -+#undef EXTRA_SPECS -+#define EXTRA_SPECS \ -+ { "asm_cpu", ASM_CPU_SPEC }, \ -+ { "asm_cpu_default", ASM_CPU_DEFAULT_SPEC }, \ -+ { "link_cpu", LINK_CPU_SPEC } -+ -+ -+/* begin-GG-local: dynamic libraries */ -+ -+extern int amigaos_do_collecting (void); -+extern void amigaos_gccopts_hook (const char *); -+extern void amigaos_libname_hook (const char* arg); -+extern void amigaos_collect2_cleanup (void); -+extern void amigaos_prelink_hook (const char **, int *); -+extern void amigaos_postlink_hook (const char *); -+ -+/* This macro is used to check if all collect2 facilities should be used. -+ We need a few special ones, like stripping after linking. */ -+ -+#define DO_COLLECTING (do_collecting || amigaos_do_collecting()) -+ -+/* This macro is called in collect2 for every GCC argument name. -+ ARG is a part of commandline (without '\0' at the end). */ -+ -+#define COLLECT2_GCC_OPTIONS_HOOK(ARG) amigaos_gccopts_hook(ARG) -+ -+/* This macro is called in collect2 for every ld's "-l" or "*.o" or "*.a" -+ argument. ARG is a complete argument, with '\0' at the end. */ -+ -+#define COLLECT2_LIBNAME_HOOK(ARG) amigaos_libname_hook(ARG) -+ -+/* This macro is called at collect2 exit, to clean everything up. */ -+ -+#define COLLECT2_EXTRA_CLEANUP amigaos_collect2_cleanup -+ -+/* This macro is called just before the first linker invocation. -+ LD1_ARGV is "char** argv", which will be passed to "ld". STRIP is an -+ *address* of "strip_flag" variable. */ -+ -+#define COLLECT2_PRELINK_HOOK(LD1_ARGV, STRIP) \ -+amigaos_prelink_hook((const char **)(LD1_ARGV), (STRIP)) -+ -+/* This macro is called just after the first linker invocation, in place of -+ "nm" and "ldd". OUTPUT_FILE is the executable's filename. */ -+ -+#define COLLECT2_POSTLINK_HOOK(OUTPUT_FILE) amigaos_postlink_hook(OUTPUT_FILE) -+/* end-GG-local */ -+ -+#undef MAX_OFILE_ALIGNMENT -+#define MAX_OFILE_ALIGNMENT ((1 << 15)*BITS_PER_UNIT) -+ -+#if 0 -+#undef INCLUDE_DEFAULTS -+#define INCLUDE_DEFAULTS \ -+ { \ -+ { GPLUSPLUS_INCLUDE_DIR, "G++", 1, 1, \ -+ GPLUSPLUS_INCLUDE_DIR_ADD_SYSROOT, 0 }, \ -+ { GCC_INCLUDE_DIR, "GCC", 0, 0 }, \ -+ { CROSS_INCLUDE_DIR "/../../os-include", "GCC", 0, 0 }, \ -+ { TOOL_INCLUDE_DIR "/../ndk/include", "GCC", 0, 0 }, \ -+ { CROSS_INCLUDE_DIR, "GCC", 0, 0, 0 }, \ -+ { 0, 0, 0, 0 } \ -+ } -+#endif -+ -+#undef FIXED_INCLUDE_DIR -+#define FIXED_INCLUDE_DIR CROSS_INCLUDE_DIR "/../../os-include" -+ -diff --git a/gcc/config/m68k/m68kemb.h b/gcc/config/m68k/m68kemb.h -index 0d8d88c74ea9..29b3e194f12d 100644 ---- gcc/config/m68k/m68kemb.h -+++ gcc/config/m68k/m68kemb.h -@@ -32,12 +32,14 @@ - #define NEEDS_UNTYPED_CALL 1 - - /* Target OS builtins. */ -+#ifndef TARGET_OS_CPP_BUILTINS - #define TARGET_OS_CPP_BUILTINS() \ - do \ - { \ - builtin_define ("__embedded__"); \ - } \ - while (0) -+#endif - - /* Override the default LIB_SPEC from gcc.c. We don't currently support - profiling, or libg.a. */ -diff --git a/gcc/config/m68k/t-amigaos b/gcc/config/m68k/t-amigaos -new file mode 100755 -index 000000000000..112d5daa06fb ---- /dev/null -+++ gcc/config/m68k/t-amigaos -@@ -0,0 +1,30 @@ -+# Makefile fragment for AmigaOS target. -+ -+# Extra object file linked to the cc1* executables. -+amigaos.o: $(srcdir)/config/m68k/amigaos.c $(CONFIG_H) -+ $(CXX) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) $< $(OUTPUT_OPTION) -+ -+# Additional target dependent options for compiling libgcc.a. This just -+# ensures that we don't compile libgcc* with anything other than a -+# fixed stack. -+ -+#TARGET_LIBGCC2_CFLAGS = -mfixedstack -+ -+# Support for building multiple version of libgcc. -+ -+LIBGCC_MULTI = .; \ -+ libb;@fbaserel \ -+ libm020;@m68020 \ -+ libb/libm020;@fbaserel@m68020 \ -+ libb32/libm020;@fbaserel32@m68020 -+ -+### begin-GG-local: dynamic libraries -+# Extra objects that get compiled and linked to collect2 -+ -+EXTRA_COLLECT2_OBJS = amigacollect2.o -+ -+# Build supplimentary AmigaOS target support file for collect2 -+amigacollect2.o: amigacollect2.c -+ $(CXX) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -+ -DA2IXDIR_PREFIX=\"$(prefix)/share/a2ixlibrary\" $< $(OUTPUT_OPTION) -+### end-GG-local -diff --git a/gcc/config/m68k/x-amigaos b/gcc/config/m68k/x-amigaos -new file mode 100755 -index 000000000000..a8f60b80f9f4 ---- /dev/null -+++ gcc/config/m68k/x-amigaos -@@ -0,0 +1,104 @@ -+# Makefile fragment for AmigaOS host -+ -+# Each compilation environment (Manx, Dice, GCC, SAS/C, etc) provides its -+# own equivalent of the UNIX /usr/include tree. For gcc, the standard headers -+# are in /gg/include and system specific headers are in /gg/os-include. -+# Use these paths for fixincludes. -+ -+SYSTEM_HEADER_DIR = $(prefix)/include -+ -+# Uncomment the following macro to get a resident GCC. We don't do it -+# by default, since we want to support users with mc68000. -+# WARNING! If you uncomment this, you MUST add the same flags to the -+# libiberty's Makefile (libiberty is now linked into GCC executables). -+ -+#RESIDENT = -m68020 -resident32 -+ -+# Additional host flags that are not used when compiling with GCC_FOR_TARGET, -+# such as when compiling the libgcc* runtime archives. GCC uses stack -+# a lot, and since AmigaOS provides processes with a small, fixed size -+# stack, we have to generate code that will extend it whenever necessary. -+ -+XCFLAGS = -mstackextend $(RESIDENT) -+ -+# AmigaOS supports "AmigaGuide(R)" hypertext files. For GCC, these are -+# build with a custom "makeinfo". -+ -+# Arrange for guides to be build with GCC, in the build directory. -+ -+### begin-GG-local: gcc-amigaos -+#EXTRA_DOC_TARGETS = guide gcc-amigaos-doc -+### end-GG-local -+ -+# Actually build guides -+ -+guide:: doc/cpp.guide doc/gcc.guide doc/gccint.guide \ -+ doc/gccinstall.guide doc/cppinternals.guide -+ -+doc/cpp.guide: $(TEXI_CPP_FILES) -+doc/gcc.guide: $(TEXI_GCC_FILES) -+doc/gccint.guide: $(TEXI_GCCINT_FILES) -+doc/cppinternals.guide: $(TEXI_CPPINT_FILES) -+ -+doc/%.guide: %.texi -+ if [ x$(BUILD_INFO) = xinfo ]; then \ -+ $(MAKEINFO) --amiga $(MAKEINFOFLAGS) -I $(docdir) \ -+ -I $(docdir)/include -o $@ $<; \ -+ fi -+ -+# Duplicate entry to handle renaming of gccinstall.guide -+doc/gccinstall.guide: $(TEXI_GCCINSTALL_FILES) -+ if [ x$(BUILD_INFO) = xinfo ]; then \ -+ $(MAKEINFO) --amiga $(MAKEINFOFLAGS) -I $(docdir) \ -+ -I $(docdir)/include -o $@ install.texi; \ -+ fi -+ -+# Arrange for guides to be installed with GCC. -+ -+### begin-GG-local: gcc-amigaos -+#EXTRA_INSTALL_TARGETS = install-guide install-gcc-amigaos-doc -+### end-GG-local -+ -+# Where the guide files go -+ -+guidedir = $(prefix)/guide -+ -+# Actually install guides. -+ -+installdirs-guide: -+ $(SHELL) ${srcdir}/mkinstalldirs $(DESTDIR)$(guidedir) -+ -+install-guide: doc installdirs-guide \ -+ $(DESTDIR)$(guidedir)/cpp.guide \ -+ $(DESTDIR)$(guidedir)/gcc.guide \ -+ $(DESTDIR)$(guidedir)/cppinternals.guide \ -+ $(DESTDIR)$(guidedir)/gccinstall.guide \ -+ $(DESTDIR)$(guidedir)/gccint.guide -+ -+$(DESTDIR)$(guidedir)/%.guide: doc/%.guide installdirs-guide -+ rm -f $@ -+ if [ -f $< ]; then \ -+ for f in $(<)*; do \ -+ realfile=`echo $$f | sed -e 's|.*/$[^/]*$$$|\1|'`; \ -+ $(INSTALL_DATA) $$f $(DESTDIR)$(guidedir)/$$realfile; \ -+ chmod a-x $(DESTDIR)$(guidedir)/$$realfile; \ -+ done; \ -+ else true; fi -+ -+### begin-GG-local: gcc-amigaos -+# Build and install gcc-amigaos.guide - documentation specific to the -+# AmigaOS port of GCC. -+ -+gcc-amigaos-doc:: doc/gcc-amigaos.info doc/gcc-amigaos.guide -+ -+doc/gcc-amigaos.info doc/gcc-amigaos.guide: gcc-amigaos.texi -+ -+install-gcc-amigaos-doc: doc installdirs installdirs-guide \ -+ $(DESTDIR)$(infodir)/gcc-amigaos.info \ -+ $(DESTDIR)$(guidedir)/gcc-amigaos.guide -+### end-GG-local -+ -+host-amigaos.o : $(srcdir)/config/m68k/host-amigaos.c $(CONFIG_H) $(SYSTEM_H) \ -+ coretypes.h hosthooks.h hosthooks-def.h toplev.h diagnostic.h -+ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \ -+ $(srcdir)/config/m68k/host-amigaos.c -diff --git a/gcc/config/m68k/xm-amigaos.h b/gcc/config/m68k/xm-amigaos.h -new file mode 100755 -index 000000000000..bb571ba040b3 ---- /dev/null -+++ gcc/config/m68k/xm-amigaos.h -@@ -0,0 +1,64 @@ -+/* Configuration for GNU C-compiler for m68k Amiga, running AmigaOS. -+ Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2003 -+ Free Software Foundation, Inc. -+ Contributed by Markus M. Wild (wild(a)amiga.physik.unizh.ch). -+ -+This file is part of GCC. -+ -+GCC is free software; you can redistribute it and/or modify -+it under the terms of the GNU General Public License as published by -+the Free Software Foundation; either version 2, or (at your option) -+any later version. -+ -+GCC is distributed in the hope that it will be useful, -+but WITHOUT ANY WARRANTY; without even the implied warranty of -+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -+GNU General Public License for more details. -+ -+You should have received a copy of the GNU General Public License -+along with GCC; see the file COPYING. If not, write to -+the Free Software Foundation, 59 Temple Place - Suite 330, -+Boston, MA 02111-1307, USA. */ -+ -+#ifndef _FCNTL_H_ -+#include <fcntl.h> -+#endif -+ -+/* AmigaOS specific headers, such as from the Native Developer Update kits, -+ go in SYSTEM_INCLUDE_DIR. STANDARD_INCLUDE_DIR is the equivalent of -+ Unix "/usr/include". All other include paths are set in Makefile. */ -+ -+#define SYSTEM_INCLUDE_DIR "/gg/os-include" -+#define STANDARD_INCLUDE_DIR "/gg/include" -+ -+#define STANDARD_EXEC_PREFIX_1 "/gg/libexec/gcc/" -+#define STANDARD_EXEC_PREFIX_2 "/gg/lib/gcc/" -+#define STANDARD_STARTFILE_PREFIX_1 "/gg/lib/" -+#define STANDARD_STARTFILE_PREFIX_2 "/gg/lib/" -+ -+/* The AmigaOS stores file names with regard to upper/lower case, but actions -+ on existing files are case independent on the standard filesystems. -+ -+ A good example of where this causes problems is the conflict between the C -+ include file <string.h> and the C++ include file <String.h>, where the C++ -+ include file dir is searched first and thus causes includes of <string.h> -+ to include <String.h> instead. -+ -+ In order to solve this problem we define the macro OPEN_CASE_SENSITIVE as -+ the name of the function that takes the same args as open() and does case -+ dependent opens. */ -+ -+#define OPEN_CASE_SENSITIVE(NAME, FLAGS, MODE) open ((NAME), (FLAGS) | O_CASE, (MODE)) -+ -+/* On the AmigaOS, there are two pathname separators, '/' (DIR_SEPARATOR) -+ and ':' (VOL_SEPARATOR). DIR_SEPARATOR defaults to the correct -+ character, so we don't have to explicitly set it. */ -+ -+#define DIR_SEPARATOR '/' -+#define VOL_SEPARATOR ':' -+#define DIR_SEPARATOR_2 VOL_SEPARATOR -+ -+/* Zap PREFIX_INCLUDE_DIR, since with the AmigaOS port it is the same as -+ STANDARD_INCLUDE_DIR. */ -+ -+#undef PREFIX_INCLUDE_DIR -diff --git a/gcc/expr.c b/gcc/expr.c -index eb77ba0fe533..a2e6a7cac927 100644 ---- gcc/expr.c -+++ gcc/expr.c -@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple.h" - #include "predict.h" --#include "tm_p.h" - #include "ssa.h" - #include "expmed.h" - #include "optabs.h" -diff --git a/gcc/function.c b/gcc/function.c -index 401f8f90160d..0c35f094f4cb 100644 ---- gcc/function.c -+++ gcc/function.c -@@ -35,13 +35,13 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple-expr.h" - #include "cfghooks.h" - #include "df.h" --#include "tm_p.h" - #include "stringpool.h" - #include "expmed.h" - #include "optabs.h" -diff --git a/gcc/ipa-chkp.c b/gcc/ipa-chkp.c -index 86c48f14f64d..dc72a5f21021 100644 ---- gcc/ipa-chkp.c -+++ gcc/ipa-chkp.c -@@ -23,6 +23,8 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" -+#include "target.h" - #include "tree.h" - #include "gimple.h" - #include "tree-pass.h" -diff --git a/gcc/tree-chkp.c b/gcc/tree-chkp.c -index 4ca2d34607c6..472e203306b8 100644 ---- gcc/tree-chkp.c -+++ gcc/tree-chkp.c -@@ -22,6 +22,7 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" -diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c -index 9f09d30b1f91..149c0c123804 100644 ---- gcc/var-tracking.c -+++ gcc/var-tracking.c -@@ -89,13 +89,13 @@ - #include "system.h" - #include "coretypes.h" - #include "backend.h" -+#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "cfghooks.h" - #include "alloc-pool.h" - #include "tree-pass.h" --#include "tm_p.h" - #include "insn-config.h" - #include "regs.h" - #include "emit-rtl.h" -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index bbbcd5d7ce0c..c8ce02987284 100755 ---- libstdc++-v3/configure -+++ libstdc++-v3/configure -@@ -28820,6 +28820,10 @@ else - - # Base decisions on target environment. - case "${host}" in -+ m68k-*-*) -+ # Nothing to do here. -+ ;; -+ - arm*-*-symbianelf*) - # This is a freestanding configuration; there is nothing to do here. - ;; - -From 6951210c6e4901b5e963a19f5cae44bc0560a915 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 15 Dec 2016 00:37:25 +0100 -Subject: [PATCH 002/303] @N add .project file - ---- - .project | 11 +++++++++++ - 1 file changed, 11 insertions(+) - create mode 100644 .project - -diff --git a/.project b/.project -new file mode 100644 -index 000000000000..ab5c4b198d08 ---- /dev/null -+++ .project -@@ -0,0 +1,11 @@ -+<?xml version="1.0" encoding="UTF-8"?> -+<projectDescription> -+ <name>gcc-6</name> -+ <comment></comment> -+ <projects> -+ </projects> -+ <buildSpec> -+ </buildSpec> -+ <natures> -+ </natures> -+</projectDescription> - -From c81713312a097d40d212a5ac5bce13b1aff7b226 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 11 Jan 2017 12:09:34 +0100 -Subject: [PATCH 003/303] @B support named sections - ---- - gcc/config/m68k/amigaos.c | 8 ++++++++ - gcc/config/m68k/amigaos.h | 17 ++++++++++------- - 2 files changed, 18 insertions(+), 7 deletions(-) - mode change 100755 => 100644 gcc/config/m68k/amigaos.c - mode change 100755 => 100644 gcc/config/m68k/amigaos.h - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -old mode 100755 -new mode 100644 -index 90bc3218bab7..facb57a28aa3 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -771,3 +771,11 @@ amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, - } - - -+/* Output assembly to switch to section NAME with attribute FLAGS. */ -+ -+extern void -+amiga_named_section (const char *name, unsigned int flags, tree decl ATTRIBUTE_UNUSED) -+{ -+ fprintf (asm_out_file, "\t.section\t%s\n", name); -+} -+ -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -old mode 100755 -new mode 100644 -index 1a33225ab60f..d347a9be63db ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -113,7 +113,15 @@ Boston, MA 02111-1307, USA. */ - N_("Restore a4 in all functions") }, \ - { "no-always-restore-a4", - MASK_ALWAYS_RESTORE_A4, \ - N_("Do not restore a4 in all functions") } -- -+ -+ -+/* Support sections in chip memory, currently '.datachip' only. */ -+extern void -+amiga_named_section (const char *name, unsigned int flags, tree decl); -+ -+#undef TARGET_ASM_NAMED_SECTION -+#define TARGET_ASM_NAMED_SECTION amiga_named_section -+ - #if 0 - /* Various ABI issues. */ - -@@ -139,9 +147,6 @@ Boston, MA 02111-1307, USA. */ - #undef PIC_OFFSET_TABLE_REGNUM - #define PIC_OFFSET_TABLE_REGNUM (flag_pic ? 12 : INVALID_REGNUM) - --#undef PIC_REG --#define PIC_REG 12 -- - /* Use A5 as framepointer instead of A6, since the AmigaOS ABI requires A6 - to be used as a shared library base pointer in direct library calls. */ - -@@ -182,9 +187,7 @@ Boston, MA 02111-1307, USA. */ - - /* XXX: section support */ - #if 0 --/* Support sections in chip memory, currently '.datachip' only. */ --#undef TARGET_ASM_NAMED_SECTION --#define TARGET_ASM_NAMED_SECTION amiga_named_section -+ - - /* We define TARGET_ASM_NAMED_SECTION, but we don't support arbitrary sections, - including '.gcc_except_table', so we emulate the standard behaviour. */ - -From 6a04e2c9671b3d0d0de708cd0eb9fdb9bb4d5811 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 12 Jan 2017 00:10:47 +0100 -Subject: [PATCH 004/303] @B fix null ptr - ---- - gcc/config/m68k/amigaos.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index facb57a28aa3..8727c7184812 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -508,7 +508,7 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - /* FIXME: Two last conditions below are workarounds for bugs. */ - else if (INTEGRAL_MODE_P (mode) && mode != CQImode && mode != CHImode) - { -- if (POINTER_TYPE_P(type)) -+ if (!type || POINTER_TYPE_P(type)) - regbegin = 8; /* Ax */ - else - regbegin = 0; /* Dx */ - -From 09a2cda05b28a749e39d8e0af34ef3556eb21d6a Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 12 Jan 2017 00:12:11 +0100 -Subject: [PATCH 005/303] @I added quirky -fbaserel -fbaserel32 - really - working? nut sure... - ---- - gcc/config/m68k/amigaos.h | 2 +- - gcc/config/m68k/amigaos.opt | 7 +++++++ - gcc/config/m68k/m68k.c | 20 +++++++++++--------- - 3 files changed, 19 insertions(+), 10 deletions(-) - mode change 100755 => 100644 gcc/config/m68k/amigaos.opt - -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index d347a9be63db..fd89bb34352c 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -471,7 +471,7 @@ extern tree amigaos_handle_type_attribute(tree *, tree, tree, int, bool*); - #define SUBTARGET_OVERRIDE_OPTIONS \ - do \ - { \ -- if (!TARGET_68020 && flag_pic==4) \ -+ if (!TARGET_68020 && flag_pic==2) \ - error ("-fbaserel32 is not supported on the 68000 or 68010\n"); \ - if (amigaos_regparm > 0 && amigaos_regparm > AMIGAOS_MAX_REGPARM) \ - error ("-mregparm=x with 1 <= x <= %d\n", AMIGAOS_MAX_REGPARM); \ -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -old mode 100755 -new mode 100644 -index a9bc80c4f5b6..4298bc90abe1 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -11,3 +11,10 @@ msmall-code - Target RejectNegative - small code model - -+fbaserel -+Target Common Report Var(flag_pic,3) Negative(fpie) Init(-1) -+Backward compatibility, use -fpic now -+ -+fbaserel32 -+Target Common Report Var(flag_pic,4) Negative(fPIE) Init(-1) -+Backward compatibility, use -fPIC now -\ No newline at end of file -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index fe3a939e1530..ce28681c1dc9 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -557,7 +557,7 @@ m68k_option_override (void) - : (m68k_cpu_flags & FL_COLDFIRE) != 0 ? FPUTYPE_COLDFIRE - : FPUTYPE_68881); - -- /* Sanity check to ensure that msep-data and mid-sahred-library are not -+ /* Sanity check to ensure that msep-data and mid-shared-library are not - * both specified together. Doing so simply doesn't make sense. - */ - if (TARGET_SEP_DATA && TARGET_ID_SHARED_LIBRARY) -@@ -568,7 +568,7 @@ m68k_option_override (void) - * -fpic but it hasn't been tested properly. - */ - if (TARGET_SEP_DATA || TARGET_ID_SHARED_LIBRARY) -- flag_pic = 2; -+ flag_pic = TARGET_68020 ? 2 : 1; - - /* -mpcrel -fPIC uses 32-bit pc-relative displacements. Raise an - error if the target does not support them. */ -@@ -1139,9 +1139,9 @@ m68k_expand_prologue (void) - current_frame.reg_mask, true, true)); - } - -- if (!TARGET_SEP_DATA -- && crtl->uses_pic_offset_table) -- emit_insn (gen_load_got (pic_offset_table_rtx)); -+// if (!TARGET_SEP_DATA -+// && crtl->uses_pic_offset_table) -+// emit_insn (gen_load_got (pic_offset_table_rtx)); - } - - /* Return true if a simple (return) instruction is sufficient for this -@@ -4693,8 +4693,10 @@ print_operand_address (FILE *file, rtx addr) - { - struct m68k_address address; - -- if (!m68k_decompose_address (QImode, addr, true, &address)) -+ if (!m68k_decompose_address (QImode, addr, true, &address)) { -+ debug_rtx(addr); - gcc_unreachable (); -+ } - - if (address.code == PRE_DEC) - fprintf (file, MOTOROLA ? "-(%s)" : "%s@-", -@@ -4719,7 +4721,7 @@ print_operand_address (FILE *file, rtx addr) - /* (d16,PC) or (bd,PC,Xn) (with suppressed index register). */ - fputc ('(', file); - output_addr_const (file, addr); -- asm_fprintf (file, flag_pic == 1 ? ":w,%Rpc)" : ":l,%Rpc)"); -+ asm_fprintf (file, flag_pic == 1 || flag_pic == 3 ? ":w,%Rpc)" : ":l,%Rpc)"); - } - else - { -@@ -5124,8 +5126,8 @@ m68k_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED, - /* Use the static chain register as a temporary (call-clobbered) - GOT pointer for this function. We can use the static chain - register because it isn't live on entry to the thunk. */ -- SET_REGNO (pic_offset_table_rtx, STATIC_CHAIN_REGNUM); -- emit_insn (gen_load_got (pic_offset_table_rtx)); -+// SET_REGNO (pic_offset_table_rtx, STATIC_CHAIN_REGNUM); -+// emit_insn (gen_load_got (pic_offset_table_rtx)); - } - legitimize_pic_address (XEXP (mem, 0), Pmode, tmp); - mem = replace_equiv_address (mem, tmp); - -From e807bcc3fe2a83cc3b617c78c7f81685e861b5d1 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 12 Jan 2017 00:20:27 +0100 -Subject: [PATCH 006/303] @I - ---- - gcc/config/m68k/amigaos.c | 0 - gcc/config/m68k/amigaos.h | 0 - gcc/config/m68k/amigaos.opt | 0 - 3 files changed, 0 insertions(+), 0 deletions(-) - mode change 100644 => 100755 gcc/config/m68k/amigaos.c - mode change 100644 => 100755 gcc/config/m68k/amigaos.h - mode change 100644 => 100755 gcc/config/m68k/amigaos.opt - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -old mode 100644 -new mode 100755 -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -old mode 100644 -new mode 100755 -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -old mode 100644 -new mode 100755 - -From 79e34a64428598cfb90bdf9f67aa32ad8c02effb Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 12 Jan 2017 00:21:21 +0100 -Subject: [PATCH 007/303] Revert "@I" - -This reverts commit e807bcc3fe2a83cc3b617c78c7f81685e861b5d1. ---- - gcc/config/m68k/amigaos.c | 0 - gcc/config/m68k/amigaos.h | 0 - gcc/config/m68k/amigaos.opt | 0 - 3 files changed, 0 insertions(+), 0 deletions(-) - mode change 100755 => 100644 gcc/config/m68k/amigaos.c - mode change 100755 => 100644 gcc/config/m68k/amigaos.h - mode change 100755 => 100644 gcc/config/m68k/amigaos.opt - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -old mode 100755 -new mode 100644 -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -old mode 100755 -new mode 100644 -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -old mode 100755 -new mode 100644 - -From 010fd69732e88d124686e46202f7a26bc9fa77ec Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 12 Jan 2017 15:13:10 +0100 -Subject: [PATCH 008/303] @B fix endless option parsing loop - ---- - gcc/config/m68k/amigaos.opt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 4298bc90abe1..f933fe29b98b 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -12,9 +12,9 @@ Target RejectNegative - small code model - - fbaserel --Target Common Report Var(flag_pic,3) Negative(fpie) Init(-1) -+Target Common Report Var(flag_pic,3) Init(-1) - Backward compatibility, use -fpic now - - fbaserel32 --Target Common Report Var(flag_pic,4) Negative(fPIE) Init(-1) -+Target Common Report Var(flag_pic,4) Init(-1) - Backward compatibility, use -fPIC now -\ No newline at end of file - -From c8b17fa2d8719ce6efc9535408966cd7ce87e2b8 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Tue, 31 Jan 2017 20:42:38 +0100 -Subject: [PATCH 009/303] @N re-added old target options, @R -fbaserel seems to - work - ---- - gcc/config/m68k/amigaos.c | 7 +- - gcc/config/m68k/amigaos.opt | 20 ++- - gcc/config/m68k/m68k.c | 30 +++-- - gcc/config/m68k/m68kamigaos.h | 283 ++++++++++++++++++++++++++++++++---------- - 4 files changed, 257 insertions(+), 83 deletions(-) - mode change 100755 => 100644 gcc/config/m68k/m68kamigaos.h - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index 8727c7184812..19b0f5b4cc82 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -41,6 +41,8 @@ Boston, MA 02111-1307, USA. */ - #include "config/m68k/amigaos.h" - - -+//int amiga_declare_object; -+ - #if 0 - static int amigaos_put_in_text (tree); - static rtx gen_stack_management_call (rtx, rtx, const char *); -@@ -776,6 +778,9 @@ amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, - extern void - amiga_named_section (const char *name, unsigned int flags, tree decl ATTRIBUTE_UNUSED) - { -- fprintf (asm_out_file, "\t.section\t%s\n", name); -+ if (0 == strncmp(".text", name, 5)) -+ name = ".text"; -+// fprintf (asm_out_file, "\t.section\t%s\n", name); -+ fprintf (asm_out_file, "\t%s\n", name); - } - -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index f933fe29b98b..29a3688470d0 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -12,9 +12,21 @@ Target RejectNegative - small code model - - fbaserel --Target Common Report Var(flag_pic,3) Init(-1) --Backward compatibility, use -fpic now -+Target Common Report Var(flag_mybaserel,1) -+data is adressed relativ to a4 - - fbaserel32 --Target Common Report Var(flag_pic,4) Init(-1) --Backward compatibility, use -fPIC now -\ No newline at end of file -+Target Common Report Var(flag_mybaserel,2) -+data is adressed relativ to a4 with 32 bit offsets -+ -+resident -+Target Common Report Var(flag_mybaserel,1) -+data is adressed relativ to a4, linked as resident -+ -+resident32 -+Target Common Report Var(flag_mybaserel,2) -+data is adressed relativ to a4 with 32 bit offsets, linked as resident -+ -+mcrt= -+Target RejectNegative Var(amigaos_crt) Joined -+Specify startup binary -\ No newline at end of file -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index ce28681c1dc9..387f0c1b9e02 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -1139,9 +1139,9 @@ m68k_expand_prologue (void) - current_frame.reg_mask, true, true)); - } - --// if (!TARGET_SEP_DATA --// && crtl->uses_pic_offset_table) --// emit_insn (gen_load_got (pic_offset_table_rtx)); -+ if (!TARGET_SEP_DATA -+ && crtl->uses_pic_offset_table) -+ emit_insn (gen_load_got (pic_offset_table_rtx)); - } - - /* Return true if a simple (return) instruction is sufficient for this -@@ -4496,7 +4496,10 @@ print_operand (FILE *file, rtx op, int letter) - && !(GET_CODE (XEXP (op, 0)) == CONST_INT - && INTVAL (XEXP (op, 0)) < 0x8000 - && INTVAL (XEXP (op, 0)) >= -0x8000)) -- fprintf (file, MOTOROLA ? ".l" : ":l"); -+#ifdef TARGET_AMIGA -+ if (!flag_mybaserel) -+#endif -+ fprintf (file, MOTOROLA ? ".l" : ":l"); - } - else if (GET_CODE (op) == CONST_DOUBLE && GET_MODE (op) == SFmode) - { -@@ -4693,10 +4696,8 @@ print_operand_address (FILE *file, rtx addr) - { - struct m68k_address address; - -- if (!m68k_decompose_address (QImode, addr, true, &address)) { -- debug_rtx(addr); -+ if (!m68k_decompose_address (QImode, addr, true, &address)) - gcc_unreachable (); -- } - - if (address.code == PRE_DEC) - fprintf (file, MOTOROLA ? "-(%s)" : "%s@-", -@@ -4721,7 +4722,7 @@ print_operand_address (FILE *file, rtx addr) - /* (d16,PC) or (bd,PC,Xn) (with suppressed index register). */ - fputc ('(', file); - output_addr_const (file, addr); -- asm_fprintf (file, flag_pic == 1 || flag_pic == 3 ? ":w,%Rpc)" : ":l,%Rpc)"); -+ asm_fprintf (file, flag_pic == 1 ? ":w,%Rpc)" : ":l,%Rpc)"); - } - else - { -@@ -4738,6 +4739,15 @@ print_operand_address (FILE *file, rtx addr) - } - else - output_addr_const (file, addr); -+ -+ if (!RTX_FLAG (addr, frame_related)) -+ { -+// debug_rtx(addr); -+ if (flag_mybaserel == 1) -+ asm_fprintf (file, ".w(a4)"); -+ else if (flag_mybaserel == 2) -+ asm_fprintf (file, "(a4)"); -+ } - } - } - else -@@ -5126,8 +5136,8 @@ m68k_output_mi_thunk (FILE *file, tree thunk ATTRIBUTE_UNUSED, - /* Use the static chain register as a temporary (call-clobbered) - GOT pointer for this function. We can use the static chain - register because it isn't live on entry to the thunk. */ --// SET_REGNO (pic_offset_table_rtx, STATIC_CHAIN_REGNUM); --// emit_insn (gen_load_got (pic_offset_table_rtx)); -+ SET_REGNO (pic_offset_table_rtx, STATIC_CHAIN_REGNUM); -+ emit_insn (gen_load_got (pic_offset_table_rtx)); - } - legitimize_pic_address (XEXP (mem, 0), Pmode, tmp); - mem = replace_equiv_address (mem, tmp); -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -old mode 100755 -new mode 100644 -index 0ce599138c7d..df0ce5b52ede ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -25,6 +25,8 @@ along with GCC; see the file COPYING3. If not see - #define TARGET_AMIGA 1 - #endif - -+#define HAS_INIT_SECTION -+ - #ifndef SWBEG_ASM_OP - #define SWBEG_ASM_OP "\t.swbeg\t" - #endif -@@ -88,6 +90,28 @@ do { \ - fprintf ((FILE), "%s%u\n", ALIGN_ASM_OP, 1 << (LOG)); \ - } while (0) - -+#if 0 -+extern int amiga_declare_object; -+ -+#define ASM_DECLARE_OBJECT_NAME(FILE,NAME,DECL) \ -+if (!DECL_INITIAL (DECL) || \ -+ initializer_zerop (DECL_INITIAL (decl))) \ -+ { \ -+ amiga_declare_object = 1; \ -+ fprintf ((FILE), ".comm\t%s,", NAME); \ -+ } \ -+else \ -+ASM_OUTPUT_LABEL (FILE, NAME) -+ -+#undef ASM_OUTPUT_SKIP -+#define ASM_OUTPUT_SKIP(FILE,SIZE) \ -+if (amiga_declare_object) \ -+ fprintf (FILE, "%u\n", (int)(SIZE)); \ -+else \ -+ fprintf (FILE, "\t.skip %u\n", (int)(SIZE)); \ -+amiga_declare_object = 0 -+#endif -+ - /* Register in which address to store a structure value is passed to a - function. The default in m68k.h is a1. For m68k/SVR4 it is a0. */ - -@@ -145,14 +169,8 @@ do { \ - fprintf ((FILE), "%s&%d\n", SWBEG_ASM_OP, XVECLEN (PATTERN (TABLE), 1)); - /* end of stuff from m68kv4.h */ - --#undef ENDFILE_SPEC --#define ENDFILE_SPEC "crtend.o%s" -- --#undef STARTFILE_SPEC --#define STARTFILE_SPEC "crtbegin.o%s" -- - #ifndef BSS_SECTION_ASM_OP --#define BSS_SECTION_ASM_OP "\t.section\t.bss" -+#define BSS_SECTION_ASM_OP "\t.bss" - #endif - - #ifndef ASM_OUTPUT_ALIGNED_BSS -@@ -168,8 +186,6 @@ do { \ - provided for compatibility reasons. - When creating shared libraries, use different 'errno'. */ - -- -- - #undef TARGET_OS_CPP_BUILTINS - #define TARGET_OS_CPP_BUILTINS() \ - do \ -@@ -178,8 +194,8 @@ do { \ - builtin_define ("__saveds=__attribute__((__saveds__))"); \ - builtin_define ("__interrupt=__attribute__((__interrupt__))"); \ - builtin_define ("__stackext=__attribute__((__stackext__))"); \ -- builtin_define ("__regargs_x=__attribute__((regparm))"); \ -- builtin_define ("__stdargs_x=__attribute__((stkparm))"); \ -+ builtin_define ("__regargs=__attribute__((regparm))"); \ -+ builtin_define ("__stdargs=__attribute__((stkparm))"); \ - builtin_define ("__aligned=__attribute__((__aligned__(4)))"); \ - builtin_define_std ("amiga"); \ - builtin_define_std ("amigaos"); \ -@@ -195,6 +211,11 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - - #endif - -+/* put return values in FPU build in FP0 Reg */ -+#undef FUNCTION_VALUE_REGNO_P -+#define FUNCTION_VALUE_REGNO_P(N) \ -+ ((N) == D0_REG || (N) == A0_REG || (TARGET_68881 && (N) == FP0_REG)) -+ - /* Inform the program which CPU we compile for. */ - - //#undef TARGET_CPU_CPP_BUILTINS -@@ -229,14 +250,27 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - } \ - while (0) - */ -+ -+/* When creating shared libraries, use different 'errno'. */ -+#define CPP_IXEMUL_SPEC \ -+ "%{!ansi:-Dixemul} -D__ixemul__ -D__ixemul " \ -+ "%{malways-restore-a4:-Derrno=(*ixemul_errno)} " \ -+ "%{mrestore-a4:-Derrno=(*ixemul_errno)}" -+#define CPP_LIBNIX_SPEC \ -+ "-isystem %(sdk_root)libnix/include " \ -+ "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix" -+#define CPP_CLIB2_SPEC \ -+ "-isystem %(sdk_root)clib2/include " \ -+ "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2" -+ - /* Define __HAVE_68881__ in preprocessor according to the -m flags. - This will control the use of inline 68881 insns in certain macros. - Note: it should be set in TARGET_CPU_CPP_BUILTINS but TARGET_68881 - isn't the same -m68881 since its also true for -m680[46]0 ... - Differentiate between libnix and ixemul. */ - --#define CPP_SPEC \ -- "%{m68881:-D__HAVE_68881__} " \ -+#define CPP_SPEC \ -+ "%{m68881:-D__HAVE_68881__} " \ - "%{!ansi:" \ - "%{m68020:-Dmc68020} " \ - "%{mc68020:-Dmc68020} " \ -@@ -252,16 +286,10 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{m68030:-D__mc68030__ -D__mc68030} " \ - "%{m68040:-D__mc68040__ -D__mc68040} " \ - "%{m68060:-D__mc68060__ -D__mc68060} " \ -- "%{noixemul:%{!ansi:%{!std=*:-Dlibnix}%{std=gnu*:-Dlibnix}} -D__libnix -D__libnix__} " \ -- "%{!noixemul:%{!ansi:%{!std=*:-Dixemul}%{std=gnu*:-Dixemul}} -D__ixemul -D__ixemul__}" -- --/* Translate '-resident' to '-fbaserel' (they differ in linking stage only). -- Don't put function addresses in registers for PC-relative code. */ -- --#define CC1_SPEC \ -- "%{resident:-fbaserel} " \ -- "%{resident32:-fbaserel32} " \ -- "%{msmall-code:-fno-function-cse}" -+ "%{noixemul:%(cpp_libnix)} " \ -+ "%{mcrt=nix*:%(cpp_libnix)} " \ -+ "%{mcrt=ixemul:%(cpp_ixemul)} " \ -+ "%{mcrt=clib2:%(cpp_clib2)}" - - /* Various -m flags require special flags to the assembler. */ - -@@ -280,48 +308,56 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - #define ASM_CPU_DEFAULT_SPEC \ - "%{!m680*:%{!mc680*:-m68040}}" - --/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD -- compatible debug hunk. -- Also, pass appropriate linker flavours depending on user-supplied -- commandline options. */ -- --#define LINK_SPEC \ -- "%{noixemul:-fl libnix} " \ -- "%{resident*:-amiga-datadata-reloc} " \ -- "%{resident|fbaserel:-m amiga_bss -fl libb} " \ -- "%{resident32|fbaserel32:-m amiga_bss -fl libb32} " \ -- "%{g:-amiga-debug-hunk} " \ -- "%(link_cpu)" -- --#define LINK_CPU_SPEC \ -- "%{m6802*|mc68020|m68030|m68040|m68060:-fl libm020} " \ -- "%{m68881:-fl libm881}" -- - /* Choose the right startup file, depending on whether we use base relative - code, base relative code with automatic relocation (-resident), their - 32-bit versions, libnix, profiling or plain crt0.o. */ - --#undef STARTFILE_SPEC --#define STARTFILE_SPEC \ -- "%{!noixemul:" \ -- "%{fbaserel:%{!resident:bcrt0.o%s}}" \ -- "%{resident:rcrt0.o%s}" \ -- "%{fbaserel32:%{!resident32:lcrt0.o%s}}" \ -- "%{resident32:scrt0.o%s}" \ -- "%{!resident:%{!fbaserel:%{!resident32:%{!fbaserel32:" \ -- "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}}}}" \ -- "%{noixemul:" \ -- "%{resident:libnix/nrcrt0.o%s} " \ -- "%{!resident:%{fbaserel:libnix/nbcrt0.o%s}%{!fbaserel:libnix/ncrt0.o%s}}}" -+#define STARTFILE_IXEMUL_SPEC \ -+ "%{fbaserel:%{!resident:bcrt0.o%s}}" \ -+ "%{resident:rcrt0.o%s}" \ -+ "%{fbaserel32:%{!resident32:lcrt0.o%s}}" \ -+ "%{resident32:scrt0.o%s}" \ -+ "%{!resident:%{!fbaserel:%{!resident32:%{!fbaserel32:" \ -+ "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}}}" -+#define STARTFILE_LIBNIX_SPEC \ -+ "%(sdk_root)lib/libnix/" \ -+ "%{ramiga-*:" \ -+ "%{ramiga-lib:libinit.o%s}" \ -+ "%{ramiga-libr:libinitr.o%s}" \ -+ "%{ramiga-dev:devinit.o%s}}" \ -+ "%{!ramiga-*:" \ -+ "%{resident:nrcrt0.o%s}" \ -+ "%{!resident:" \ -+ "%{fbaserel:nbcrt0.o%s}" \ -+ "%{!fbaserel:ncrt0.o%s}}}" -+#define STARTFILE_CLIB2_SPEC \ -+ "%(sdk_root)clib2/lib/" \ -+ "%{resident32:nr32crt0.o%s}" \ -+ "%{!resident32:" \ -+ "%{fbaserel32:nb32crt0.o%s}" \ -+ "%{!fbaserel32:" \ -+ "%{resident:nrcrt0.o%s}" \ -+ "%{!resident:" \ -+ "%{fbaserel:nbcrt0.o%s}" \ -+ "%{!fbaserel:ncrt0.o%s}}}}" - --#undef ENDFILE_SPEC --#define ENDFILE_SPEC \ -- "%{noixemul:-lstubs}" -+#undef STARTFILE_SPEC -+#define STARTFILE_SPEC \ -+ "%{noixemul:%(startfile_libnix)} " \ -+ "%{mcrt=nix*:%(startfile_libnix)} " \ -+ "%{mcrt=ixemul:%(startfile_ixemul)} " \ -+ "%{mcrt=clib2:%(startfile_clib2)}" - --/* put return values in FPU build in FP0 Reg */ --#undef FUNCTION_VALUE_REGNO_P --#define FUNCTION_VALUE_REGNO_P(N) \ -- ((N) == D0_REG || (N) == A0_REG || (TARGET_68881 && (N) == FP0_REG)) -+#define ENDFILE_IXEMUL_SPEC "" -+#define ENDFILE_LIBNIX_SPEC "-lstubs" -+#define ENDFILE_CLIB2_SPEC "" -+ -+#undef ENDFILE_SPEC -+#define ENDFILE_SPEC \ -+ "%{noixemul:%(endfile_libnix)} " \ -+ "%{mcrt=nix*:%(endfile_libnix)} " \ -+ "%{mcrt=ixemul:%(endfile_ixemul)} " \ -+ "%{mcrt=clib2:%(endfile_clib2)}" - - - /* Automatically search libamiga.a for AmigaOS specific functions. Note -@@ -337,13 +373,106 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - to put in a -lamiga himself and get it in the wrong place, so that (for - example) calls like sprintf come from -lamiga rather than -lc. */ - --#undef LIB_SPEC --#define LIB_SPEC \ -- "%{!noixemul:" \ -- "%{p|pg:-lc_p}" \ -- "%{!p:%{!pg:-lc -lamiga -lc}}}" \ -- "%{noixemul:" \ -- "-lnixmain -lnix -lamiga %{mstackcheck|mstackextend:-lstack}}" -+#define LIB_IXEMUL_SPEC \ -+ "%{!p:%{!pg:-lc -lamiga -lc}} " \ -+ "%{p:-lc_p} %{pg:-lc_p}" -+#define LIB_LIBNIX_SPEC \ -+ "-lnixmain -lnix -lstubs " \ -+ "%{mcrt=*:-l%*} " \ -+ "%{!mcrt=*:-lnix20} " \ -+ "-lamiga " \ -+ "%{mstackcheck:-lstack} " \ -+ "%{mstackextend:-lstack}" -+#define LIB_CLIB2_SPEC \ -+ "-lc -lamiga -ldebug " \ -+ "%{mstackcheck:-lstack} " \ -+ "%{mstackextend:-lstack}" -+ -+#define LIB_SPEC \ -+ "%{noixemul:%(lib_libnix)} " \ -+ "%{mcrt=nix*:%(lib_libnix)} " \ -+ "%{mcrt=ixemul:%(lib_ixemul)} " \ -+ "%{mcrt=clib2:%(lib_clib2)}" -+ -+#define LIBGCC_IXEMUL_SPEC "" -+#define LIBGCC_LIBNIX_SPEC "-lnix " \ -+ "%{mcrt=*:-l%*} " \ -+ "%{!mcrt=*:-lnix20}" -+#define LIBGCC_CLIB2_SPEC "-lc" -+//#define LIBGCC_SPEC "-lgcc " -+#define LIBGCC_SPEC " " \ -+ "%{noixemul:%(libgcc_libnix)} " \ -+ "%{mcrt=nix*:%(libgcc_libnix)} " \ -+ "%{mcrt=ixemul:%(libgcc_ixemul)} " \ -+ "%{mcrt=clib2:%(libgcc_clib2)}" -+ -+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD -+ compatible debug hunk. -+ Also, pass appropriate linker flavours depending on user-supplied -+ commandline options. */ -+ -+#define LINK_IXEMUL_SPEC "" -+#define LINK_LIBNIX_SPEC "-L%(sdk_root)libnix/lib -fl libnix" -+#define LINK_CLIB2_SPEC "-L%(sdk_root)clib2/lib" -+ -+/* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD -+ compatible debug hunk. -+ Also, pass appropriate linker flavours depending on user-supplied -+ commandline options. */ -+ -+#define LINK_SPEC \ -+ "%{noixemul:%(link_libnix)} " \ -+ "%{mcrt=nix*:%(link_libnix)} " \ -+ "%{mcrt=ixemul:%(link_ixemul)} " \ -+ "%{mcrt=clib2:%(link_clib2)} " \ -+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb}} " \ -+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb} " \ -+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32}} " \ -+ "%{resident32:-m amiga_bss -amiga-datadata-reloc -fl libb32} " \ -+ "%{g:-amiga-debug-hunk} " \ -+ "%{m68020:-fl libm020} " \ -+ "%{mc68020:-fl libm020} " \ -+ "%{m68030:-fl libm020} " \ -+ "%{m68040:-fl libm020} " \ -+ "%{m68060:-fl libm020} " \ -+ "%{m68020-40:-fl libm020} " \ -+ "%{m68020-60:-fl libm020} " \ -+ "%{m68881:-fl libm881}" -+ -+/* Translate '-resident' to '-fbaserel' (they differ in linking stage only). -+ Don't put function addresses in registers for PC-relative code. */ -+ -+#define CC1_SPEC \ -+ "%{resident:-fbaserel} " \ -+ "%{resident32:-fbaserel32} " \ -+ "%{msmall-code:-fno-function-cse}" -+ -+#define LINK_CPU_SPEC \ -+ "%{m6802*|mc68020|m68030|m68040|m68060:-fl libm020} " \ -+ "%{m68881:-fl libm881}" -+ -+/* [cahirwpz] A modified copy of LINK_COMMAND_SPEC from gcc/gcc.c file. -+ Don't prepend libgcc.a to link libraries and make sure the options is -+ at the end of command line. Otherwise linker chooses generic functions -+ from libgcc.a instead AmigaOS-specific counterparts from libnix.a. */ -+ -+#define LINK_COMMAND_SPEC \ -+ "%{!fsyntax-only:" \ -+ "%{!c:" \ -+ "%{!M:" \ -+ "%{!MM:" \ -+ "%{!E:" \ -+ "%{!S:" \ -+ "%(linker) %l %X %{o*} %{A} %{d} %{e*} %{m} " \ -+ "%{N} %{n} %{r} %{s} %{t} %{u*} %{x} %{z} %{Z} " \ -+ "%{!A:%{!nostdlib:%{!nostartfiles:%S}}} " \ -+ "%{static:} %{L*} %D %o " \ -+ "%{!nostdlib:%{!nodefaultlibs:%L}} " \ -+ "%{!A:%{!nostdlib:%{!nostartfiles:%E}}} " \ -+ "%{!nostdlib:%{!nodefaultlibs:%G}} " \ -+ "%{T*} }}}}}} " \ -+ -+ - - /* This macro defines names of additional specifications to put in the specs - that can be used in various specifications like CC1_SPEC. Its definition -@@ -358,8 +487,26 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - #define EXTRA_SPECS \ - { "asm_cpu", ASM_CPU_SPEC }, \ - { "asm_cpu_default", ASM_CPU_DEFAULT_SPEC }, \ -- { "link_cpu", LINK_CPU_SPEC } -- -+ { "link_cpu", LINK_CPU_SPEC }, \ -+ {"sdk_root", TOOLDIR_BASE_PREFIX "m68k-amigaos/"}, \ -+ {"cpp_ixemul", CPP_IXEMUL_SPEC}, \ -+ {"cpp_libnix", CPP_LIBNIX_SPEC}, \ -+ {"cpp_clib2", CPP_CLIB2_SPEC}, \ -+ {"lib_ixemul", LIB_IXEMUL_SPEC}, \ -+ {"lib_libnix", LIB_LIBNIX_SPEC}, \ -+ {"lib_clib2", LIB_CLIB2_SPEC}, \ -+ {"link_ixemul", LINK_IXEMUL_SPEC}, \ -+ {"link_libnix", LINK_LIBNIX_SPEC}, \ -+ {"link_clib2", LINK_CLIB2_SPEC}, \ -+ {"startfile_ixemul", STARTFILE_IXEMUL_SPEC}, \ -+ {"startfile_libnix", STARTFILE_LIBNIX_SPEC}, \ -+ {"startfile_clib2", STARTFILE_CLIB2_SPEC}, \ -+ {"endfile_ixemul", ENDFILE_IXEMUL_SPEC}, \ -+ {"endfile_libnix", ENDFILE_LIBNIX_SPEC}, \ -+ {"endfile_clib2", ENDFILE_CLIB2_SPEC}, \ -+ {"libgcc_ixemul", LIBGCC_IXEMUL_SPEC}, \ -+ {"libgcc_libnix", LIBGCC_LIBNIX_SPEC}, \ -+ {"libgcc_clib2", LIBGCC_CLIB2_SPEC} - - /* begin-GG-local: dynamic libraries */ - - -From d1df1ebb0f08f356222c21b1744476eb881b3b0c Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 1 Feb 2017 11:40:21 +0100 -Subject: [PATCH 010/303] @B mregparm was always enabled with 2 registers. Now - it's off. - ---- - gcc/config/m68k/amigaos.c | 30 ++++++++++++++++++------------ - gcc/config/m68k/amigaos.opt | 2 +- - gcc/config/m68k/m68k.c | 11 ++++++----- - 3 files changed, 25 insertions(+), 18 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index 19b0f5b4cc82..e2dd5bab75f9 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -40,6 +40,12 @@ Boston, MA 02111-1307, USA. */ - #include "diagnostic-core.h" - #include "config/m68k/amigaos.h" - -+//#define MYDEBUG 1 -+#ifdef MYDEBUG -+#define DPRINTF(x) printf x; fflush(stdout); -+#else -+#define DPRINTF(x) -+#endif - - //int amiga_declare_object; - -@@ -379,8 +385,8 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype) - { - struct amigaos_args * cum = &mycum; - lastcum = cump; -- cum->num_of_regs = amigaos_regparm; --// printf("amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs); fflush(stdout); -+ cum->num_of_regs = amigaos_regparm > 0 ? amigaos_regparm : 0; -+ DPRINTF(("amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs)); - - /* Initialize a variable CUM of type CUMULATIVE_ARGS - for a call to a function whose data type is FNTYPE. -@@ -396,7 +402,7 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype) - else - { - tree ratree = lookup_attribute ("regparm", TYPE_ATTRIBUTES(fntype)); -- cum->num_of_regs = amigaos_regparm ? -+ cum->num_of_regs = amigaos_regparm != 0 ? - amigaos_regparm : AMIGAOS_DEFAULT_REGPARM; - if (ratree) - { -@@ -456,7 +462,7 @@ amigaos_function_arg_advance (cumulative_args_t cum_v, machine_mode, const_tree, - CUMULATIVE_ARGS *cump = (CUMULATIVE_ARGS *) get_cumulative_args (cum_v); - /* Update the data in CUM to advance over an argument. */ - -- // printf("amigaos_function_arg_advance1 %p\r\n", cump); fflush(stdout); -+ DPRINTF(("amigaos_function_arg_advance1 %p\r\n", cump)); - if (cump != lastcum) - return; - -@@ -490,7 +496,7 @@ static struct rtx_def * - _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - { - struct amigaos_args * cum = &mycum; -- // printf("m68k_function_arg numOfRegs=%p\r\n", cum); -+ DPRINTF(("m68k_function_arg numOfRegs=%d\r\n", cum ? cum->num_of_regs : 0)); - - if (cump != lastcum) - return 0; -@@ -550,7 +556,7 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - - if (cum->last_arg_reg != -1) - { -- // printf("-> gen_rtx_REG %d\r\n", cum->last_arg_reg); -+ DPRINTF(("-> gen_rtx_REG %d\r\n", cum->last_arg_reg)); - return gen_rtx_REG (mode, cum->last_arg_reg); - } - } -@@ -566,7 +572,7 @@ amigaos_function_arg (cumulative_args_t cum_v, machine_mode mode, - { - struct amigaos_args * cum = &mycum; - -- // printf("amigaos_function_arg %p\r\n", cum_v.p); fflush(stdout); -+ DPRINTF(("amigaos_function_arg %p\r\n", cum_v.p)); - - CUMULATIVE_ARGS *cump = (CUMULATIVE_ARGS *) get_cumulative_args (cum_v); - -@@ -598,7 +604,7 @@ amigaos_function_arg (cumulative_args_t cum_v, machine_mode mode, - int - amigaos_comp_type_attributes (const_tree type1, const_tree type2) - { -- printf("amigaos_comp_type_attributes\n"); -+ DPRINTF(("amigaos_comp_type_attributes\n")); - /* Functions or methods are incompatible if they specify mutually exclusive - ways of passing arguments. */ - if (TREE_CODE(type1) == FUNCTION_TYPE || TREE_CODE(type1) == METHOD_TYPE) -@@ -688,7 +694,7 @@ amigaos_handle_type_attribute (tree *node, tree name, tree args, - { - tree nnn = *node; - do { // while (0); --// printf("%p with treecode %d\n", node, TREE_CODE(nnn)); fflush(stdout); -+ DPRINTF(("%p with treecode %d\n", node, TREE_CODE(nnn))); - if (TREE_CODE (nnn) == FUNCTION_DECL || TREE_CODE (nnn) == FUNCTION_TYPE - || TREE_CODE (nnn) == METHOD_TYPE) - { -@@ -696,7 +702,7 @@ amigaos_handle_type_attribute (tree *node, tree name, tree args, - single class that should be used to pass arguments. */ - if (is_attribute_p ("regparm", name)) - { --// printf ("regparm found\n"); fflush(stdout); -+ DPRINTF(("regparm found\n")); - - if (lookup_attribute ("stkparm", TYPE_ATTRIBUTES(nnn))) - { -@@ -706,7 +712,7 @@ amigaos_handle_type_attribute (tree *node, tree name, tree args, - if (args && TREE_CODE (args) == TREE_LIST) - { - tree val = TREE_VALUE(args); --// printf ("regparm with val: %d\n", TREE_CODE(val)); -+ DPRINTF(("regparm with val: %d\n", TREE_CODE(val))); - if (TREE_CODE (val) == INTEGER_CST) - { - int no = TREE_INT_CST_LOW(val); -@@ -765,7 +771,7 @@ bool - amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, - int *total, bool speed) - { --// printf("outer: %d, opno: %d", outer_code, opno); fflush(stdout); -+ DPRINTF(("outer: %d, opno: %d", outer_code, opno)); - // debug_rtx(x); - bool r = m68k_rtx_costs (x, mode, outer_code, opno, total, speed); - *total *= 4; -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 29a3688470d0..212ab8e6efda 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -1,6 +1,6 @@ - - mregparm= --Target RejectNegative Var(amigaos_regparm) Joined UInteger -+Target RejectNegative Var(amigaos_regparm) Joined UInteger Init(-1) - Pass arguments through registers. - - noixemul -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index 387f0c1b9e02..3ebc9020c4e0 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -166,7 +166,7 @@ static bool m68k_save_reg (unsigned int regno, bool interrupt_handler); - static bool m68k_ok_for_sibcall_p (tree, tree); - static bool m68k_tls_symbol_p (rtx); - static rtx m68k_legitimize_address (rtx, rtx, machine_mode); --#ifndef TARGET_AMIGAOS -+#ifndef TARGET_AMIGA - static - #endif - bool m68k_rtx_costs (rtx, machine_mode, int, int, int *, bool); -@@ -2803,7 +2803,7 @@ const_int_cost (HOST_WIDE_INT i) - } - } - --#ifndef TARGET_AMIGAOS -+#ifndef TARGET_AMIGA - static - #endif - bool -@@ -4544,9 +4544,10 @@ m68k_get_reloc_decoration (enum m68k_reloc reloc) - switch (reloc) - { - case RELOC_GOT: -- if (TARGET_AMIGAOS) -- return ""; -- else if (MOTOROLA) -+// if (TARGET_AMIGA) -+// return ""; -+// else -+ if (MOTOROLA) - { - if (flag_pic == 1 && TARGET_68020) - return "@GOT.w"; - -From 0a6678c57629151eaec736ce82fa69dcc4e08c53 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 9 Feb 2017 22:01:27 +0100 -Subject: [PATCH 011/303] @B select correct crt0 file with baserel32 - ---- - gcc/config/m68k/m68kamigaos.h | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index df0ce5b52ede..0650102861e8 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -329,7 +329,10 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{resident:nrcrt0.o%s}" \ - "%{!resident:" \ - "%{fbaserel:nbcrt0.o%s}" \ -- "%{!fbaserel:ncrt0.o%s}}}" -+ "%{!fbaserel:" \ -+ "%{fbaserel32:nlbcrt0.o%s}" \ -+ "%{!fbaserel32:ncrt0.o%s}}}}" -+ - #define STARTFILE_CLIB2_SPEC \ - "%(sdk_root)clib2/lib/" \ - "%{resident32:nr32crt0.o%s}" \ -@@ -430,6 +433,7 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32}} " \ - "%{resident32:-m amiga_bss -amiga-datadata-reloc -fl libb32} " \ - "%{g:-amiga-debug-hunk} " \ -+ "%{mcpu=68020:-fl libm020} " \ - "%{m68020:-fl libm020} " \ - "%{mc68020:-fl libm020} " \ - "%{m68030:-fl libm020} " \ - -From 38ec4180a5c5d9d7a87725d347838f3b55f837fa Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 9 Feb 2017 22:02:40 +0100 -Subject: [PATCH 012/303] @B -m68881 is not longer enabled by default for - -m68020 - ---- - gcc/config/m68k/m68k.c | 14 ++++++++++++-- - 1 file changed, 12 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index 3ebc9020c4e0..c67194fa292d 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -352,11 +352,21 @@ struct gcc_target targetm = TARGET_INITIALIZER; - /* Base flags for 68k ISAs. */ - #define FL_FOR_isa_00 FL_ISA_68000 - #define FL_FOR_isa_10 (FL_FOR_isa_00 | FL_ISA_68010) --/* FL_68881 controls the default setting of -m68881. gcc has traditionally -+/* "FL_68881 controls the default setting of -m68881. gcc has traditionally - generated 68881 code for 68020 and 68030 targets unless explicitly told -- not to. */ -+ not to." -+ -+ This is not true at least for the AMIGA. -+ gcc 2.93 does not set the 68881 flag. -+ -+ */ -+#ifdef TARGET_AMIGA -+#define FL_FOR_isa_20 (FL_FOR_isa_10 | FL_ISA_68020 \ -+ | FL_BITFIELD | FL_CAS) -+#else - #define FL_FOR_isa_20 (FL_FOR_isa_10 | FL_ISA_68020 \ - | FL_BITFIELD | FL_68881 | FL_CAS) -+#endif - #define FL_FOR_isa_40 (FL_FOR_isa_20 | FL_ISA_68040) - #define FL_FOR_isa_cpu32 (FL_FOR_isa_10 | FL_ISA_68020) - - -From 5d9da9f9a2d9fec32fba2b7b9f2326d1f1c4f1f0 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 9 Feb 2017 22:05:42 +0100 -Subject: [PATCH 013/303] @R added a hack to support multiline __asm("...") - statements - ---- - gcc/c/c-parser.c | 7 +++++++ - libcpp/lex.c | 23 ++++++++++++++++++++++- - 2 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/gcc/c/c-parser.c b/gcc/c/c-parser.c -index d8725b572b55..cde6fe0c1c59 100644 ---- gcc/c/c-parser.c -+++ gcc/c/c-parser.c -@@ -3908,6 +3908,7 @@ c_parser_asm_string_literal (c_parser *parser) - static tree - c_parser_simple_asm_expr (c_parser *parser) - { -+ extern int in_assembler_directive; - tree str; - gcc_assert (c_parser_next_token_is_keyword (parser, RID_ASM)); - /* ??? Follow the C++ parser rather than using the -@@ -3919,7 +3920,13 @@ c_parser_simple_asm_expr (c_parser *parser) - parser->lex_untranslated_string = false; - return NULL_TREE; - } -+ -+ // SBF: set in_assembler_directive to enable multi-line strings. And yes, it's a HACK. -+ in_assembler_directive = 1; - str = c_parser_asm_string_literal (parser); -+ // SBF: in_assembler_directive disabled -+ in_assembler_directive = 0; -+ - parser->lex_untranslated_string = false; - if (!c_parser_require (parser, CPP_CLOSE_PAREN, "expected %<)%>")) - { -diff --git a/libcpp/lex.c b/libcpp/lex.c -index e5a0397f3099..c2131adeb38e 100644 ---- libcpp/lex.c -+++ libcpp/lex.c -@@ -64,6 +64,10 @@ static tokenrun *next_tokenrun (tokenrun *); - - static _cpp_buff *new_buff (size_t); - -+/* -+ * SBF: This flag is set if an asm statement is parsed, to support multiline strings in __asm() -+ */ -+int in_assembler_directive; - - /* Utility routine: - -@@ -1063,7 +1067,10 @@ _cpp_process_line_notes (cpp_reader *pfile, int in_comment) - else if (note->type == 0) - /* Already processed in lex_raw_string. */; - else -- abort (); -+ { -+// abort (); -+ printf("ups: note type=%d\n", note->type); -+ } - } - } - -@@ -1875,6 +1882,20 @@ lex_string (cpp_reader *pfile, cpp_token *token, const uchar *base) - break; - else if (c == '\n') - { -+ /* -+ * SBF: allow multi-line strings -+ * Ignore the line end and move to next line. -+ * Only fail, if there is no next line -+ */ -+ if (in_assembler_directive) -+ { -+ cpp_buffer *buffer = pfile->buffer; -+ if (buffer->cur < buffer->rlimit) -+ CPP_INCREMENT_LINE (pfile, 0); -+ buffer->need_line = true; -+ if (_cpp_get_fresh_line (pfile)) -+ continue; -+ } - cur--; - /* Unmatched quotes always yield undefined behavior, but - greedy lexing means that what appears to be an unterminated - -From 6515b7470c3baf385a0dca132bc1c71acbcdda5f Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 12 Feb 2017 12:40:37 +0100 -Subject: [PATCH 014/303] @R allow used registers inside of the clobber list - ---- - gcc/cfgexpand.c | 12 ++++++++++-- - 1 file changed, 10 insertions(+), 2 deletions(-) - -diff --git a/gcc/cfgexpand.c b/gcc/cfgexpand.c -index b612293b1a7a..4215ae90c63d 100644 ---- gcc/cfgexpand.c -+++ gcc/cfgexpand.c -@@ -2732,6 +2732,10 @@ tree_conflicts_with_clobbers_p (tree t, HARD_REG_SET *clobbered_regs) - { - /* Conflicts between asm-declared register variables and the clobber - list are not allowed. */ -+ /* -+ * SBF: Why? -+ */ -+#ifndef TARGET_AMIGA - tree overlap = tree_overlaps_hard_reg_set (t, clobbered_regs); - - if (overlap) -@@ -2744,7 +2748,7 @@ tree_conflicts_with_clobbers_p (tree t, HARD_REG_SET *clobbered_regs) - DECL_REGISTER (overlap) = 0; - return true; - } -- -+#endif - return false; - } - -@@ -3255,11 +3259,15 @@ expand_asm_stmt (gasm *stmt) - if (reg_overlap_mentioned_p (clobbered_reg, output_rvec[k])) - internal_error ("asm clobber conflict with output operand"); - -+/** -+ * SBF: Why? -+ */ -+#ifndef TARGET_AMIGA - for (unsigned k = 0; k < ninputs - ninout; ++k) - if (reg_overlap_mentioned_p (clobbered_reg, input_rvec[k])) - internal_error ("asm clobber conflict with input operand"); -+#endif - } -- - XVECEXP (body, 0, i++) = gen_rtx_CLOBBER (VOIDmode, clobbered_reg); - } - - -From 7de2f3e6f2786a6d5e789230227f9d7c5f3e2316 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 12 Feb 2017 12:41:09 +0100 -Subject: [PATCH 015/303] @B fix mixing struct/class for the same class. - ---- - gcc/coretypes.h | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gcc/coretypes.h b/gcc/coretypes.h -index 12067fdf5348..f0f069f6afa2 100644 ---- gcc/coretypes.h -+++ gcc/coretypes.h -@@ -52,9 +52,9 @@ typedef const struct bitmap_head *const_bitmap; - struct simple_bitmap_def; - typedef struct simple_bitmap_def *sbitmap; - typedef const struct simple_bitmap_def *const_sbitmap; --struct rtx_def; --typedef struct rtx_def *rtx; --typedef const struct rtx_def *const_rtx; -+class rtx_def; -+typedef class rtx_def *rtx; -+typedef const class rtx_def *const_rtx; - - /* Subclasses of rtx_def, using indentation to show the class - hierarchy, along with the relevant invariant. - -From bb99da7652edb584a7825632fdccf0db0d7080d4 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 12 Feb 2017 12:42:09 +0100 -Subject: [PATCH 016/303] @B fixed - on an unsigned value, add cast to signed - ---- - gcc/hwint.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/hwint.h b/gcc/hwint.h -index 14740ccc939a..cd4a35c98f7b 100644 ---- gcc/hwint.h -+++ gcc/hwint.h -@@ -294,7 +294,7 @@ abs_hwi (HOST_WIDE_INT x) - inline unsigned HOST_WIDE_INT - absu_hwi (HOST_WIDE_INT x) - { -- return x >= 0 ? (unsigned HOST_WIDE_INT)x : -(unsigned HOST_WIDE_INT)x; -+ return x >= 0 ? (unsigned HOST_WIDE_INT)x : -(signed HOST_WIDE_INT)x; - } - - #endif /* ! GCC_HWINT_H */ - -From e66d5a27e1e5257373172597fe9a699011b011d7 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 12 Feb 2017 12:42:45 +0100 -Subject: [PATCH 017/303] @N add amiga target - ---- - libgcc/config.host | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/libgcc/config.host b/libgcc/config.host -index 124f2ceaefda..1849a2ec1980 100644 ---- libgcc/config.host -+++ libgcc/config.host -@@ -811,6 +811,9 @@ m32r-*-linux*) - m32rle-*-linux*) - tmake_file="$tmake_file m32r/t-linux t-fdpbit" - ;; -+m68k-*-amiga*) -+ tmake_file="$tmake_file m68k/t-floatlib" -+ ;; - m68k-*-elf* | fido-*-elf) - tmake_file="$tmake_file m68k/t-floatlib" - ;; - -From c61b7d29f7f89cbec99115f6dfbb81b5e2967188 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 12 Feb 2017 12:44:25 +0100 -Subject: [PATCH 018/303] @B fix specs and linking paths issues - ---- - gcc/config/m68k/amigaos.h | 9 ++++----- - gcc/config/m68k/m68kamigaos.h | 41 ++++++++++++++++++++++------------------- - gcc/gcc.c | 37 +++++++++++++++++++++++++++++++++++++ - 3 files changed, 63 insertions(+), 24 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index fd89bb34352c..5f3348feb726 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -122,7 +122,6 @@ amiga_named_section (const char *name, unsigned int flags, tree decl); - #undef TARGET_ASM_NAMED_SECTION - #define TARGET_ASM_NAMED_SECTION amiga_named_section - --#if 0 - /* Various ABI issues. */ - - /* This is (almost;-) BSD, so it wants DBX format. */ -@@ -183,12 +182,10 @@ amiga_named_section (const char *name, unsigned int flags, tree decl); - //#define DEFAULT_MAIN_RETURN c_expand_return (integer_zero_node) - - #undef WCHAR_TYPE --#define WCHAR_TYPE "unsigned int" -+#define WCHAR_TYPE "unsigned short" - - /* XXX: section support */ --#if 0 -- -- -+#if 0 - /* We define TARGET_ASM_NAMED_SECTION, but we don't support arbitrary sections, - including '.gcc_except_table', so we emulate the standard behaviour. */ - #undef TARGET_ASM_EXCEPTION_SECTION -@@ -222,6 +219,8 @@ do \ - } \ - while (0) - -+#if 0 -+ - /* Baserel support. */ - - /* Given that symbolic_operand(X), return TRUE if no special -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index 0650102861e8..6ba2e6736b6a 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -257,10 +257,10 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{malways-restore-a4:-Derrno=(*ixemul_errno)} " \ - "%{mrestore-a4:-Derrno=(*ixemul_errno)}" - #define CPP_LIBNIX_SPEC \ -- "-isystem %(sdk_root)libnix/include " \ -+ "-isystem %:sdk_root(libnix/include) " \ - "%{!ansi:-Dlibnix} -D__libnix__ -D__libnix" - #define CPP_CLIB2_SPEC \ -- "-isystem %(sdk_root)clib2/include " \ -+ "-isystem %:sdk_root(clib2/include) " \ - "%{!ansi:-DCLIB2} -D__CLIB2__ -D__CLIB2" - - /* Define __HAVE_68881__ in preprocessor according to the -m flags. -@@ -320,7 +320,7 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{!resident:%{!fbaserel:%{!resident32:%{!fbaserel32:" \ - "%{pg:gcrt0.o%s}%{!pg:%{p:mcrt0.o%s}%{!p:crt0.o%s}}}}}}" - #define STARTFILE_LIBNIX_SPEC \ -- "%(sdk_root)lib/libnix/" \ -+ "%:sdk_root(libnix/lib/libnix/ " \ - "%{ramiga-*:" \ - "%{ramiga-lib:libinit.o%s}" \ - "%{ramiga-libr:libinitr.o%s}" \ -@@ -331,10 +331,11 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{fbaserel:nbcrt0.o%s}" \ - "%{!fbaserel:" \ - "%{fbaserel32:nlbcrt0.o%s}" \ -- "%{!fbaserel32:ncrt0.o%s}}}}" -+ "%{!fbaserel32:ncrt0.o%s}}}}" \ -+ ")" - - #define STARTFILE_CLIB2_SPEC \ -- "%(sdk_root)clib2/lib/" \ -+ "%:sdk_root(clib2/lib/ " \ - "%{resident32:nr32crt0.o%s}" \ - "%{!resident32:" \ - "%{fbaserel32:nb32crt0.o%s}" \ -@@ -342,7 +343,8 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{resident:nrcrt0.o%s}" \ - "%{!resident:" \ - "%{fbaserel:nbcrt0.o%s}" \ -- "%{!fbaserel:ncrt0.o%s}}}}" -+ "%{!fbaserel:ncrt0.o%s}}}}" \ -+ ")" - - #undef STARTFILE_SPEC - #define STARTFILE_SPEC \ -@@ -398,12 +400,11 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{mcrt=clib2:%(lib_clib2)}" - - #define LIBGCC_IXEMUL_SPEC "" --#define LIBGCC_LIBNIX_SPEC "-lnix " \ -+#define LIBGCC_LIBNIX_SPEC "-lnix -fl libnix " \ - "%{mcrt=*:-l%*} " \ - "%{!mcrt=*:-lnix20}" - #define LIBGCC_CLIB2_SPEC "-lc" --//#define LIBGCC_SPEC "-lgcc " --#define LIBGCC_SPEC " " \ -+#define LIBGCC_SPEC "-lgcc " \ - "%{noixemul:%(libgcc_libnix)} " \ - "%{mcrt=nix*:%(libgcc_libnix)} " \ - "%{mcrt=ixemul:%(libgcc_ixemul)} " \ -@@ -415,8 +416,8 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - commandline options. */ - - #define LINK_IXEMUL_SPEC "" --#define LINK_LIBNIX_SPEC "-L%(sdk_root)libnix/lib -fl libnix" --#define LINK_CLIB2_SPEC "-L%(sdk_root)clib2/lib" -+#define LINK_LIBNIX_SPEC "-L%:sdk_root(libnix/lib) -fl libnix" -+#define LINK_CLIB2_SPEC "-L%:sdk_root(clib2/lib)" - - /* If debugging, tell the linker to output amiga-hunk symbols *and* a BSD - compatible debug hunk. -@@ -428,10 +429,10 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{mcrt=nix*:%(link_libnix)} " \ - "%{mcrt=ixemul:%(link_ixemul)} " \ - "%{mcrt=clib2:%(link_clib2)} " \ -- "%{fbaserel:%{!resident:-m amiga_bss -fl libb}} " \ -- "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb} " \ -- "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32}} " \ -- "%{resident32:-m amiga_bss -amiga-datadata-reloc -fl libb32} " \ -+ "%{fbaserel:%{!resident:-m amiga_bss -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ -+ "%{resident:-m amiga_bss -amiga-datadata-reloc -fl libb %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ -+ "%{fbaserel32:%{!resident32:-m amiga_bss -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}}} " \ -+ "%{resident32:-m amiga_bss -amiga-datadata-reloc -fl libb32 %{noixemul:-fl libnix} %{mcrt=nix*:-fl libnix}} " \ - "%{g:-amiga-debug-hunk} " \ - "%{mcpu=68020:-fl libm020} " \ - "%{m68020:-fl libm020} " \ -@@ -476,7 +477,10 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - "%{!nostdlib:%{!nodefaultlibs:%G}} " \ - "%{T*} }}}}}} " \ - -+extern const char * amiga_m68k_prefix_func(int, const char **); - -+#define EXTRA_SPEC_FUNCTIONS \ -+ { "sdk_root", amiga_m68k_prefix_func }, - - /* This macro defines names of additional specifications to put in the specs - that can be used in various specifications like CC1_SPEC. Its definition -@@ -489,10 +493,9 @@ if (target_flags & (MASK_RESTORE_A4|MASK_ALWAYS_RESTORE_A4)) \ - Do not define this macro if it does not need to do anything. */ - #undef EXTRA_SPECS - #define EXTRA_SPECS \ -- { "asm_cpu", ASM_CPU_SPEC }, \ -- { "asm_cpu_default", ASM_CPU_DEFAULT_SPEC }, \ -- { "link_cpu", LINK_CPU_SPEC }, \ -- {"sdk_root", TOOLDIR_BASE_PREFIX "m68k-amigaos/"}, \ -+ {"asm_cpu", ASM_CPU_SPEC }, \ -+ {"asm_cpu_default", ASM_CPU_DEFAULT_SPEC }, \ -+ {"link_cpu", LINK_CPU_SPEC }, \ - {"cpp_ixemul", CPP_IXEMUL_SPEC}, \ - {"cpp_libnix", CPP_LIBNIX_SPEC}, \ - {"cpp_clib2", CPP_CLIB2_SPEC}, \ -diff --git a/gcc/gcc.c b/gcc/gcc.c -index 0f042b0f12f7..479a912c7b3e 100644 ---- gcc/gcc.c -+++ gcc/gcc.c -@@ -10075,3 +10075,40 @@ driver_get_configure_time_options (void (*cb) (const char *option, - obstack_free (&obstack, NULL); - n_switches = 0; - } -+ -+#ifdef TARGET_AMIGA -+const char * amiga_m68k_prefix_func(int argc, const char ** argv) { -+ char * p = 0; -+ if (standard_libexec_prefix) -+ { -+ char * glp = concat(standard_libexec_prefix, "",0); -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ *p = 0; -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ *p = 0; -+ p = strrchr(glp, '/'); -+ if (p) -+ { -+ p[1] = 0; -+ p = concat(glp, "m68k-amigaos/", 0); -+ } -+ } -+ } -+ free(glp); -+ } -+ if (!p) -+ p = concat("../../../../", "", 0); -+ -+ for (int i = 0; i < argc; ++i) { -+ char * q = concat(p, argv[i], 0); -+ free(p); -+ p = q; -+ } -+// printf("amiga_m68k_prefix_func='%s'\n", p); -+ return p; -+} -+#endif - -From 476bb08c1155ea1a630fb456301fe273f24caca7 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 13 Feb 2017 18:47:13 +0100 -Subject: [PATCH 019/303] @B disable builtins which also disables - tree-loop-distribute-patterns which causes an infinite recursion since e.g. - in memset the pattern is recognized and memset is called... - ---- - gcc/config/m68k/m68kamigaos.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index 6ba2e6736b6a..a0ab3f1a91da 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -576,3 +576,5 @@ amigaos_prelink_hook((const char **)(LD1_ARGV), (STRIP)) - #undef FIXED_INCLUDE_DIR - #define FIXED_INCLUDE_DIR CROSS_INCLUDE_DIR "/../../os-include" - -+// this disables tree_loop_distribute_patterns -+#define C_COMMON_OVERRIDE_OPTIONS flag_no_builtin = 1 - -From c1d1a53baaa94d5560d8e5d9daa749fb8b773b3a Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 16 Feb 2017 12:20:05 +0100 -Subject: [PATCH 020/303] @B fix includes for target AMIGA - ---- - libstdc++-v3/include/c_global/cstdio | 2 ++ - libstdc++-v3/include/tr1/cstdint | 1 + - 2 files changed, 3 insertions(+) - -diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio -index 86d524f96a62..522d065d4dc6 100644 ---- libstdc++-v3/include/c_global/cstdio -+++ libstdc++-v3/include/c_global/cstdio -@@ -149,7 +149,9 @@ namespace std - #if _GLIBCXX_USE_C99_STDIO - - #undef snprintf -+#ifndef AMIGA - #undef vfscanf -+#endif - #undef vscanf - #undef vsnprintf - #undef vsscanf -diff --git a/libstdc++-v3/include/tr1/cstdint b/libstdc++-v3/include/tr1/cstdint -index 7304d9008413..cdb8b704f0bb 100644 ---- libstdc++-v3/include/tr1/cstdint -+++ libstdc++-v3/include/tr1/cstdint -@@ -31,6 +31,7 @@ - - #pragma GCC system_header - -+#include <stdint.h> - #include <bits/c++config.h> - - // For 8.22.1/1 (see C99, Notes 219, 220, 222) - -From 8a098e5a7bb1c14c1afa7946dce4416596418e8a Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 16 Feb 2017 13:48:01 +0100 -Subject: [PATCH 021/303] @B fix header only for AMIGA - ---- - libstdc++-v3/include/tr1/cstdint | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/libstdc++-v3/include/tr1/cstdint b/libstdc++-v3/include/tr1/cstdint -index cdb8b704f0bb..7d6ab77ce17a 100644 ---- libstdc++-v3/include/tr1/cstdint -+++ libstdc++-v3/include/tr1/cstdint -@@ -30,8 +30,9 @@ - #define _GLIBCXX_TR1_CSTDINT 1 - - #pragma GCC system_header -- -+#ifdef AMIGA - #include <stdint.h> -+#endif - #include <bits/c++config.h> - - // For 8.22.1/1 (see C99, Notes 219, 220, 222) - -From a3e959953b7386e1576961fb4666f704b2edac7f Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sat, 18 Feb 2017 20:19:06 +0100 -Subject: [PATCH 022/303] @V version resports now 6.3.1a instead of 6.3.1 - ---- - gcc/BASE-VER | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/BASE-VER b/gcc/BASE-VER -index dc0208aba8e4..b557a4031409 100644 ---- gcc/BASE-VER -+++ gcc/BASE-VER -@@ -1 +1 @@ --6.3.1 -+6.3.1a - -From 708b7bc6002cf54e04d7f67e3fdb6627aead7714 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 19 Feb 2017 20:24:20 +0100 -Subject: [PATCH 023/303] @B fix __regargs, __stdargs plus register - distribution - ---- - gcc/config/m68k/amigaos-protos.h | 4 ++-- - gcc/config/m68k/amigaos.c | 19 +++++++++++-------- - gcc/config/m68k/amigaos.h | 2 ++ - gcc/config/m68k/m68kamigaos.h | 4 ++-- - 4 files changed, 17 insertions(+), 12 deletions(-) - mode change 100755 => 100644 gcc/config/m68k/amigaos-protos.h - -diff --git a/gcc/config/m68k/amigaos-protos.h b/gcc/config/m68k/amigaos-protos.h -old mode 100755 -new mode 100644 -index 66b553ab568f..97733002f4f9 ---- gcc/config/m68k/amigaos-protos.h -+++ gcc/config/m68k/amigaos-protos.h -@@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */ - #undef TARGET_AMIGAOS - #define TARGET_AMIGAOS 1 - --extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *, tree); -+extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *, tree, tree); - - /* Initialize a variable CUM of type CUMULATIVE_ARGS - for a call to a function whose data type is FNTYPE. -@@ -32,7 +32,7 @@ extern void amigaos_init_cumulative_args (CUMULATIVE_ARGS *, tree); - - #undef INIT_CUMULATIVE_ARGS - #define INIT_CUMULATIVE_ARGS(CUM, FNTYPE, LIBNAME, INDIRECT, N_NAMED_ARGS) \ -- (amigaos_init_cumulative_args(&(CUM), (FNTYPE))) -+ (amigaos_init_cumulative_args(&(CUM), (FNTYPE), (INDIRECT))) - - - extern int amigaos_restore_a4 (void); -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index e2dd5bab75f9..ad4bb9130cd5 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -381,7 +381,7 @@ static CUMULATIVE_ARGS * lastcum; - For a library call, FNTYPE is 0. */ - - void --amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype) -+amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype, tree decl) - { - struct amigaos_args * cum = &mycum; - lastcum = cump; -@@ -397,11 +397,12 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype) - - if (fntype) - { -- if (lookup_attribute ("stkparm", TYPE_ATTRIBUTES(fntype))) -- cum->num_of_regs = 0; -+ tree attrs = DECL_ATTRIBUTES(decl); -+ if (lookup_attribute ("stkparm", attrs)) -+ cum->num_of_regs = 0; - else - { -- tree ratree = lookup_attribute ("regparm", TYPE_ATTRIBUTES(fntype)); -+ tree ratree = lookup_attribute ("regparm", attrs); - cum->num_of_regs = amigaos_regparm != 0 ? - amigaos_regparm : AMIGAOS_DEFAULT_REGPARM; - if (ratree) -@@ -530,11 +531,11 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - long mask; - - look_for_reg: mask = 1 << regbegin; -- for (reg = 0; reg < cum->num_of_regs; reg++, mask <<= 1) -+ for (reg = 0; reg < AMIGAOS_MAX_REGPARM; reg++, mask <<= 1) - if (!(cum->regs_already_used & mask)) - { - int end; -- for (end = reg; end < cum->num_of_regs && end < reg + len; -+ for (end = reg; end < AMIGAOS_MAX_REGPARM && end < reg + len; - end++, mask <<= 1) - if (cum->regs_already_used & mask) - break; -@@ -546,8 +547,9 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - } - } - -- if (reg == cum->num_of_regs && altregbegin != -1) -+ if (reg == AMIGAOS_MAX_REGPARM && altregbegin != -1) - { -+ DPRINTF(("look for alt reg\n")); - regbegin = altregbegin; - altregbegin = -1; - goto look_for_reg; -@@ -556,6 +558,7 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - - if (cum->last_arg_reg != -1) - { -+ --cum->num_of_regs; - DPRINTF(("-> gen_rtx_REG %d\r\n", cum->last_arg_reg)); - return gen_rtx_REG (mode, cum->last_arg_reg); - } -@@ -771,7 +774,7 @@ bool - amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, - int *total, bool speed) - { -- DPRINTF(("outer: %d, opno: %d", outer_code, opno)); -+// DPRINTF(("outer: %d, opno: %d", outer_code, opno)); - // debug_rtx(x); - bool r = m68k_rtx_costs (x, mode, outer_code, opno, total, speed); - *total *= 4; -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index 5f3348feb726..71a978e6df97 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -481,6 +481,8 @@ while (0) - affects_type_identity } */ - #define SUBTARGET_ATTRIBUTES \ - { "regparm", 1, 1, true, false, false, amigaos_handle_type_attribute,\ -+ false }, \ -+ { "stkparm", 0, 0, true, false, false, amigaos_handle_type_attribute,\ - false }, - - #define GOT_SYMBOL_NAME "" -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index a0ab3f1a91da..539d5f0bf934 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -194,8 +194,8 @@ amiga_declare_object = 0 - builtin_define ("__saveds=__attribute__((__saveds__))"); \ - builtin_define ("__interrupt=__attribute__((__interrupt__))"); \ - builtin_define ("__stackext=__attribute__((__stackext__))"); \ -- builtin_define ("__regargs=__attribute__((regparm))"); \ -- builtin_define ("__stdargs=__attribute__((stkparm))"); \ -+ builtin_define ("__regargs=__attribute__((__regparm__))"); \ -+ builtin_define ("__stdargs=__attribute__((__stkparm__))"); \ - builtin_define ("__aligned=__attribute__((__aligned__(4)))"); \ - builtin_define_std ("amiga"); \ - builtin_define_std ("amigaos"); \ - -From e9ccb451229b09a1fdb64eb125d3ac0c733c5e9e Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 20 Feb 2017 08:32:06 +0100 -Subject: [PATCH 024/303] @B do not append (a4) to function references. - ---- - gcc/config/m68k/m68k.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index c67194fa292d..bd76c766a735 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -4751,7 +4751,7 @@ print_operand_address (FILE *file, rtx addr) - else - output_addr_const (file, addr); - -- if (!RTX_FLAG (addr, frame_related)) -+ if (!RTX_FLAG (addr, frame_related) && !SYMBOL_REF_FUNCTION_P(addr)) - { - // debug_rtx(addr); - if (flag_mybaserel == 1) - -From 40f1afb4c03c2bb79e86c5fb8fa2e7daa45d8600 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 20 Feb 2017 08:35:34 +0100 -Subject: [PATCH 025/303] @B enable reg-rename in O2+ and fix it. - ---- - gcc/regrename.c | 5 +++-- - gcc/toplev.c | 2 +- - 2 files changed, 4 insertions(+), 3 deletions(-) - -diff --git a/gcc/regrename.c b/gcc/regrename.c -index 9643f328ea3e..9816d3eaf5d2 100644 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -406,8 +406,9 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - - /* In the first pass, we force the renaming of registers that - don't belong to PREFERRED_CLASS to registers that do, even -- though the latters were used not very long ago. */ -- if ((pass == 0 -+ though the latters were used not very long ago. -+ Also use a register if no best_new_reg was found till now */ -+ if (((pass == 0 || !has_preferred_class) - && !TEST_HARD_REG_BIT (reg_class_contents[preferred_class], - best_new_reg)) - || tick[best_new_reg] > tick[new_reg]) -diff --git a/gcc/toplev.c b/gcc/toplev.c -index 8979d2634260..96d17ee1cccc 100644 ---- gcc/toplev.c -+++ gcc/toplev.c -@@ -1299,7 +1299,7 @@ process_options (void) - flag_web = flag_unroll_loops || flag_peel_loops; - - if (flag_rename_registers == AUTODETECT_VALUE) -- flag_rename_registers = flag_unroll_loops || flag_peel_loops; -+ flag_rename_registers = flag_unroll_loops || flag_peel_loops || optimize >= 2; - - if (flag_non_call_exceptions) - flag_asynchronous_unwind_tables = 1; - -From b980bd29d8cf05a2c6d6c947547b3f1e1c4cff23 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 20 Feb 2017 10:52:45 +0100 -Subject: [PATCH 026/303] @B fix npe in amigaos_init_cumulative_args - ---- - gcc/config/m68k/amigaos.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index ad4bb9130cd5..c675bc8e01ed 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -395,7 +395,7 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype, tree decl) - cum->last_arg_reg = -1; - cum->regs_already_used = 0; - -- if (fntype) -+ if (decl) - { - tree attrs = DECL_ATTRIBUTES(decl); - if (lookup_attribute ("stkparm", attrs)) - -From 215f15335dca293e65f47fde15a3d6486c551629 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Feb 2017 12:46:18 +0100 -Subject: [PATCH 027/303] @B -mregparm conforms now to the spec. - ---- - gcc/config/m68k/amigaos.c | 22 +++++++++++----------- - 1 file changed, 11 insertions(+), 11 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index c675bc8e01ed..916140bdc628 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -386,7 +386,7 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype, tree decl) - struct amigaos_args * cum = &mycum; - lastcum = cump; - cum->num_of_regs = amigaos_regparm > 0 ? amigaos_regparm : 0; -- DPRINTF(("amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs)); -+ DPRINTF(("0amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs)); - - /* Initialize a variable CUM of type CUMULATIVE_ARGS - for a call to a function whose data type is FNTYPE. -@@ -451,6 +451,7 @@ amigaos_init_cumulative_args (CUMULATIVE_ARGS *cump, tree fntype, tree decl) - else - /* Call to compiler-support function. */ - cum->formal_type = 0; -+ DPRINTF(("1amigaos_init_cumulative_args %p -> %d\r\n", cum, cum->num_of_regs)); - } - - /* Update the data in CUM to advance over an argument. */ -@@ -531,11 +532,11 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - long mask; - - look_for_reg: mask = 1 << regbegin; -- for (reg = 0; reg < AMIGAOS_MAX_REGPARM; reg++, mask <<= 1) -+ for (reg = 0; reg < cum->num_of_regs; reg++, mask <<= 1) - if (!(cum->regs_already_used & mask)) - { - int end; -- for (end = reg; end < AMIGAOS_MAX_REGPARM && end < reg + len; -+ for (end = reg; end < cum->num_of_regs && end < reg + len; - end++, mask <<= 1) - if (cum->regs_already_used & mask) - break; -@@ -547,18 +548,17 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - } - } - -- if (reg == AMIGAOS_MAX_REGPARM && altregbegin != -1) -- { -- DPRINTF(("look for alt reg\n")); -- regbegin = altregbegin; -- altregbegin = -1; -- goto look_for_reg; -- } -+// if (reg == AMIGAOS_MAX_REGPARM && altregbegin != -1) -+// { -+// DPRINTF(("look for alt reg\n")); -+// regbegin = altregbegin; -+// altregbegin = -1; -+// goto look_for_reg; -+// } - } - - if (cum->last_arg_reg != -1) - { -- --cum->num_of_regs; - DPRINTF(("-> gen_rtx_REG %d\r\n", cum->last_arg_reg)); - return gen_rtx_REG (mode, cum->last_arg_reg); - } - -From 419b54e138b5322b468189fbf9e234f6315b0914 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Feb 2017 12:47:40 +0100 -Subject: [PATCH 028/303] @B if -fbaserel32 -m68020 (or better) must be present - too - ---- - gcc/config/m68k/amigaos.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index 71a978e6df97..afc2c6563143 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -470,7 +470,7 @@ extern tree amigaos_handle_type_attribute(tree *, tree, tree, int, bool*); - #define SUBTARGET_OVERRIDE_OPTIONS \ - do \ - { \ -- if (!TARGET_68020 && flag_pic==2) \ -+ if (!TARGET_68020 && flag_mybaserel==2) \ - error ("-fbaserel32 is not supported on the 68000 or 68010\n"); \ - if (amigaos_regparm > 0 && amigaos_regparm > AMIGAOS_MAX_REGPARM) \ - error ("-mregparm=x with 1 <= x <= %d\n", AMIGAOS_MAX_REGPARM); \ - -From f76ce97a5f8b9542814e5700e9d728ede215749d Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Feb 2017 12:48:23 +0100 -Subject: [PATCH 029/303] @I -msmall-code sets now flag_smallcode - ---- - gcc/config/m68k/amigaos.opt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 212ab8e6efda..1faa3f2eeb26 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -8,7 +8,7 @@ Target RejectNegative - Do not use ixemul.library - use libnix instead to link - - msmall-code --Target RejectNegative -+Target RejectNegative Var(flag_smallcode,1) - small code model - - fbaserel - -From d08bd9d2a479285104f394f70be45e5f77dfa419 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Feb 2017 12:50:51 +0100 -Subject: [PATCH 030/303] @B fix baserel(32): use a4 only if common or bss is - referenced @N support -msmall-code - ---- - gcc/config/m68k/m68k.c | 36 ++++++++++++++++++++++++++++++------ - 1 file changed, 30 insertions(+), 6 deletions(-) - -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index bd76c766a735..b6ef99024ea6 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -4751,14 +4751,38 @@ print_operand_address (FILE *file, rtx addr) - else - output_addr_const (file, addr); - -- if (!RTX_FLAG (addr, frame_related) && !SYMBOL_REF_FUNCTION_P(addr)) -+#ifdef TARGET_AMIGA -+ if (SYMBOL_REF_FUNCTION_P(addr)) - { --// debug_rtx(addr); -- if (flag_mybaserel == 1) -- asm_fprintf (file, ".w(a4)"); -- else if (flag_mybaserel == 2) -- asm_fprintf (file, "(a4)"); -+ if (flag_smallcode) -+ asm_fprintf(file, ":w(pc)"); - } -+ else if (flag_mybaserel) -+ { -+ /* search the decl. */ -+ tree decl = SYMBOL_REF_DECL (addr); -+ if (!decl) -+ { -+ rtx x = XEXP(addr, 0); -+ if (CONSTANT_POOL_ADDRESS_P(x)) -+ decl = SYMBOL_REF_DECL (x); -+ if (!decl) -+ { -+ x = XEXP(x, 0); -+ decl = SYMBOL_REF_DECL (x); -+ } -+ } -+ -+ /* Qualifies for a4 if common or bss. Do not ref to .text! */ -+ if (decl && (DECL_COMMON (decl) || bss_initializer_p (decl))) -+ { -+ if (flag_mybaserel == 1) -+ asm_fprintf (file, ":W(a4)"); -+ else if (flag_mybaserel == 2) -+ asm_fprintf (file, ":L(a4)"); -+ } -+ } -+#endif - } - } - else - -From c72e9ebfc07a0b31d523b9d7428544427fe551b7 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Feb 2017 20:15:17 +0100 -Subject: [PATCH 031/303] @B undo a too optimistic change ;) - ---- - gcc/regrename.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gcc/regrename.c b/gcc/regrename.c -index 9816d3eaf5d2..df4c320700c5 100644 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -408,7 +408,7 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - don't belong to PREFERRED_CLASS to registers that do, even - though the latters were used not very long ago. - Also use a register if no best_new_reg was found till now */ -- if (((pass == 0 || !has_preferred_class) -+ if (((pass == 0) - && !TEST_HARD_REG_BIT (reg_class_contents[preferred_class], - best_new_reg)) - || tick[best_new_reg] > tick[new_reg]) - -From 181421087bf57fab0f047c47861b5c2a1e745d96 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Tue, 14 Mar 2017 21:38:30 +0100 -Subject: [PATCH 032/303] @R add better -fbaserel(32) support for TARGET_AMIGA - ---- - gcc/BASE-VER | 2 +- - gcc/config/m68k/amigaos.c | 51 +++++++++++++---- - gcc/config/m68k/amigaos.h | 21 +++---- - gcc/config/m68k/amigaos.opt | 4 +- - gcc/config/m68k/m68k.c | 130 ++++++++++++++++++++++++++++-------------- - gcc/config/m68k/m68k.md | 6 +- - gcc/config/m68k/m68kamigaos.h | 23 ++++++++ - gcc/config/m68k/predicates.md | 4 ++ - 8 files changed, 170 insertions(+), 71 deletions(-) - -diff --git a/gcc/BASE-VER b/gcc/BASE-VER -index b557a4031409..6352d5267189 100644 ---- gcc/BASE-VER -+++ gcc/BASE-VER -@@ -1 +1 @@ --6.3.1a -+6.3.1b -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index 916140bdc628..81d08245b580 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -548,13 +548,13 @@ _m68k_function_arg (CUMULATIVE_ARGS *cump, machine_mode mode, const_tree type) - } - } - --// if (reg == AMIGAOS_MAX_REGPARM && altregbegin != -1) --// { --// DPRINTF(("look for alt reg\n")); --// regbegin = altregbegin; --// altregbegin = -1; --// goto look_for_reg; --// } -+ if (reg == AMIGAOS_MAX_REGPARM && altregbegin != -1) -+ { -+ DPRINTF(("look for alt reg\n")); -+ regbegin = altregbegin; -+ altregbegin = -1; -+ goto look_for_reg; -+ } - } - - if (cum->last_arg_reg != -1) -@@ -775,9 +775,10 @@ amigaos_rtx_costs (rtx x, machine_mode mode, int outer_code, int opno, - int *total, bool speed) - { - // DPRINTF(("outer: %d, opno: %d", outer_code, opno)); --// debug_rtx(x); - bool r = m68k_rtx_costs (x, mode, outer_code, opno, total, speed); -- *total *= 4; -+// *total *= 4; -+// fprintf(stderr, "costs: %d, mode=%d, outer=%d, opno=%d, speed=%d, ok=%d\n", *total * 4, mode, outer_code, opno, speed, r); -+// debug_rtx(x); - return r; - } - -@@ -789,7 +790,37 @@ amiga_named_section (const char *name, unsigned int flags, tree decl ATTRIBUTE_U - { - if (0 == strncmp(".text", name, 5)) - name = ".text"; --// fprintf (asm_out_file, "\t.section\t%s\n", name); - fprintf (asm_out_file, "\t%s\n", name); - } - -+/* Baserel support. */ -+ -+/** -+ * Does x reference the pic_reg and is const or plus? -+ */ -+int amiga_is_const_pic_ref(const_rtx x) -+{ -+ const_rtx y = x; -+ if (flag_pic < 3) -+ return false; -+ while (GET_CODE(y) == CONST || GET_CODE(y) == PLUS) -+ y = XEXP(y, 0); -+ return (x != y && REG_P(y) && REGNO(y) == PIC_REG); -+} -+ -+ -+/* Does operand (which is a symbolic_operand) live in text space? If -+ so SYMBOL_REF_FLAG, which is set by ENCODE_SECTION_INFO, will be true. -+ -+ This function is used in base relative code generation. */ -+ -+int -+read_only_operand (rtx operand) -+{ -+ if (GET_CODE (operand) == CONST) -+ operand = XEXP (XEXP (operand, 0), 0); -+ if (GET_CODE (operand) == SYMBOL_REF) -+ return SYMBOL_REF_FLAG (operand) || CONSTANT_POOL_ADDRESS_P (operand); -+ return 1; -+} -+ -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index afc2c6563143..9820f0ed1219 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -221,18 +221,6 @@ while (0) - - #if 0 - --/* Baserel support. */ -- --/* Given that symbolic_operand(X), return TRUE if no special -- base relative relocation is necessary */ -- --#define LEGITIMATE_BASEREL_OPERAND_P(X) \ -- (flag_pic >= 3 && read_only_operand (X)) -- --#undef LEGITIMATE_PIC_OPERAND_P --#define LEGITIMATE_PIC_OPERAND_P(X) \ -- (! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X)) -- - /* Define this macro if references to a symbol must be treated - differently depending on something about the variable or - function named by the symbol (such as what section it is in). -@@ -492,3 +480,12 @@ while (0) - bool - amigaos_rtx_costs (rtx, machine_mode, int, int, int *, bool); - -+/* SBF: macro to test for const via pic_reg. */ -+#define CONST_PLUS_PIC_REG_CONST_UNSPEC_P(x) \ -+ (GET_CODE(x) == CONST \ -+ && GET_CODE(XEXP(x, 0)) == PLUS \ -+ && REG_P(XEXP(XEXP(x, 0), 0)) \ -+ && REGNO(XEXP(XEXP(x, 0), 0)) == PIC_REG \ -+ && GET_CODE(XEXP(XEXP(x, 0), 1)) == CONST \ -+ && GET_CODE(XEXP(XEXP(XEXP(x, 0), 1), 0)) == UNSPEC \ -+ ) -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 1faa3f2eeb26..4d9a42052355 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -12,11 +12,11 @@ Target RejectNegative Var(flag_smallcode,1) - small code model - - fbaserel --Target Common Report Var(flag_mybaserel,1) -+Target Report Var(flag_pic,3) - data is adressed relativ to a4 - - fbaserel32 --Target Common Report Var(flag_mybaserel,2) -+Target Report Var(flag_pic,4) - data is adressed relativ to a4 with 32 bit offsets - - resident -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index b6ef99024ea6..64dcbf6969ee 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -591,7 +591,8 @@ m68k_option_override (void) - if (TARGET_PCREL && flag_pic == 0) - flag_pic = 1; - -- if (!flag_pic) -+ /* SBF: use normal jumps/calls with baserel(32) modes. */ -+ if (!flag_pic || flag_pic > 2) - { - m68k_symbolic_call_var = M68K_SYMBOLIC_CALL_JSR; - -@@ -888,8 +889,9 @@ m68k_save_reg (unsigned int regno, bool interrupt_handler) - { - if (crtl->saves_all_registers) - return true; -+ /* SBF: do not save the PIC_REG with baserel(32) modes. */ - if (crtl->uses_pic_offset_table) -- return true; -+ return flag_pic < 3; - /* Reload may introduce constant pool references into a function - that thitherto didn't need a PIC register. Note that the test - above will not catch that case because we will only set -@@ -1149,8 +1151,9 @@ m68k_expand_prologue (void) - current_frame.reg_mask, true, true)); - } - -+ /* SBF: do not load the PIC_REG with baserel(32) */ - if (!TARGET_SEP_DATA -- && crtl->uses_pic_offset_table) -+ && crtl->uses_pic_offset_table && flag_pic < 3) - emit_insn (gen_load_got (pic_offset_table_rtx)); - } - -@@ -2135,6 +2138,12 @@ m68k_legitimate_address_p (machine_mode mode, rtx x, bool strict_p) - { - struct m68k_address address; - -+#ifdef TARGET_AMIGA -+ /* SBF: the baserel(32) const plus pic_ref, symbol is an address. */ -+ if (amiga_is_const_pic_ref(x)) -+ return true; -+#endif -+ - return m68k_decompose_address (mode, x, strict_p, &address); - } - -@@ -2468,9 +2477,33 @@ legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, - if (GET_CODE (orig) == SYMBOL_REF || GET_CODE (orig) == LABEL_REF) - { - gcc_assert (reg); -- pic_ref = m68k_wrap_symbol_into_got_ref (orig, RELOC_GOT, reg); -- pic_ref = m68k_move_to_reg (pic_ref, orig, reg); --// debug_rtx(pic_ref); -+ if (flag_pic < 3) -+ { -+ pic_ref = m68k_wrap_symbol_into_got_ref (orig, RELOC_GOT, reg); -+ pic_ref = m68k_move_to_reg (pic_ref, orig, reg); -+ } -+ #ifdef TARGET_AMIGA -+ else -+ { -+ tree decl = SYMBOL_REF_DECL (orig); -+ -+ /* SBF: Does the symbol use common or bss and qualifies for pic_reg? -+ * Do not ref to .text via pic_reg! -+ */ -+ if (!SYMBOL_REF_FUNCTION_P(orig) && decl && (DECL_COMMON (decl) || bss_initializer_p (decl))) -+ { -+ /* SBF: unfortunately using the wrapped symbol without MEM does not work. -+ * The pic_ref reference gets decomposed and leads to no working code. -+ */ -+ pic_ref = m68k_wrap_symbol (pic_ref, RELOC_GOT, m68k_get_gp (), reg); -+ -+ /* SBF: adding const avoids decomposing. */ -+ pic_ref = gen_rtx_CONST (Pmode, pic_ref); -+ } -+ else -+ pic_ref = gen_rtx_CONST (Pmode, pic_ref); -+ } -+#endif - } - else if (GET_CODE (orig) == CONST) - { -@@ -2489,7 +2522,8 @@ legitimize_pic_address (rtx orig, machine_mode mode ATTRIBUTE_UNUSED, - orig = legitimize_pic_address (XEXP (XEXP (orig, 0), 1), Pmode, - base == reg ? 0 : reg); - -- if (GET_CODE (orig) == CONST_INT) -+ /* SBF: use normal plus and rely on optimizer with baserel(32). */ -+ if (flag_pic < 3 && GET_CODE (orig) == CONST_INT) - pic_ref = plus_constant (Pmode, base, INTVAL (orig)); - else - pic_ref = gen_rtx_PLUS (Pmode, base, orig); -@@ -4453,7 +4487,6 @@ floating_exact_log2 (rtx x) - void - print_operand (FILE *file, rtx op, int letter) - { --// printf("letter: %c\n", letter); - if (letter == '.') - { - if (MOTOROLA) -@@ -4486,7 +4519,9 @@ print_operand (FILE *file, rtx op, int letter) - else if (letter == 'p') - { - output_addr_const (file, op); -- if (!(GET_CODE (op) == SYMBOL_REF && SYMBOL_REF_LOCAL_P (op))) -+ /* SBF: do not add @PLTPC with baserel(32). */ -+ if (flag_pic < 3 -+ && !(GET_CODE (op) == SYMBOL_REF && SYMBOL_REF_LOCAL_P (op))) - fprintf (file, "@PLTPC"); - } - else if (GET_CODE (op) == REG) -@@ -4505,10 +4540,12 @@ print_operand (FILE *file, rtx op, int letter) - && CONSTANT_ADDRESS_P (XEXP (op, 0)) - && !(GET_CODE (XEXP (op, 0)) == CONST_INT - && INTVAL (XEXP (op, 0)) < 0x8000 -- && INTVAL (XEXP (op, 0)) >= -0x8000)) -+ && INTVAL (XEXP (op, 0)) >= -0x8000) - #ifdef TARGET_AMIGA -- if (!flag_mybaserel) -+/* SBF: Do not append some 'l' with baserel(32). */ -+ && !CONST_PLUS_PIC_REG_CONST_UNSPEC_P(XEXP(op, 0)) - #endif -+ ) - fprintf (file, MOTOROLA ? ".l" : ":l"); - } - else if (GET_CODE (op) == CONST_DOUBLE && GET_MODE (op) == SFmode) -@@ -4554,9 +4591,18 @@ m68k_get_reloc_decoration (enum m68k_reloc reloc) - switch (reloc) - { - case RELOC_GOT: --// if (TARGET_AMIGA) --// return ""; --// else -+ /* SBF: add the proper extension for baserel relocs with baserel(32). */ -+ if (TARGET_AMIGA) -+ { -+ if (flag_pic == 1) -+ return ".w"; -+ else if (flag_pic == 3) -+ return ":W"; -+ else if (flag_pic == 4) -+ return ":L"; -+ else -+ return ""; -+ } - if (MOTOROLA) - { - if (flag_pic == 1 && TARGET_68020) -@@ -4707,6 +4753,22 @@ print_operand_address (FILE *file, rtx addr) - { - struct m68k_address address; - -+#ifdef TARGET_AMIGA -+ /* -+ * SBF: remove the const wrapper. -+ */ -+ if (CONST_PLUS_PIC_REG_CONST_UNSPEC_P(addr)) -+ { -+ print_operand_address(file, XEXP(addr, 0)); -+ return; -+ } -+ if (symbolic_operand(addr, VOIDmode)) -+ { -+ memset (&address, 0, sizeof (address)); -+ address.offset = addr; -+ } -+ else -+#endif - if (!m68k_decompose_address (QImode, addr, true, &address)) - gcc_unreachable (); - -@@ -4757,31 +4819,6 @@ print_operand_address (FILE *file, rtx addr) - if (flag_smallcode) - asm_fprintf(file, ":w(pc)"); - } -- else if (flag_mybaserel) -- { -- /* search the decl. */ -- tree decl = SYMBOL_REF_DECL (addr); -- if (!decl) -- { -- rtx x = XEXP(addr, 0); -- if (CONSTANT_POOL_ADDRESS_P(x)) -- decl = SYMBOL_REF_DECL (x); -- if (!decl) -- { -- x = XEXP(x, 0); -- decl = SYMBOL_REF_DECL (x); -- } -- } -- -- /* Qualifies for a4 if common or bss. Do not ref to .text! */ -- if (decl && (DECL_COMMON (decl) || bss_initializer_p (decl))) -- { -- if (flag_mybaserel == 1) -- asm_fprintf (file, ":W(a4)"); -- else if (flag_mybaserel == 2) -- asm_fprintf (file, ":L(a4)"); -- } -- } - #endif - } - } -@@ -5224,7 +5261,9 @@ m68k_hard_regno_rename_ok (unsigned int old_reg ATTRIBUTE_UNUSED, - - /* Value is true if hard register REGNO can hold a value of machine-mode - MODE. On the 68000, we let the cpu registers can hold any mode, but -- restrict the 68881 registers to floating-point modes. */ -+ restrict the 68881 registers to floating-point modes. -+ SBF: Disallow the frame pointer register, if the frame pointer is used. -+ */ - - bool - m68k_regno_mode_ok (int regno, machine_mode mode) -@@ -5233,12 +5272,12 @@ m68k_regno_mode_ok (int regno, machine_mode mode) - { - /* Data Registers, can hold aggregate if fits in. */ - if (regno + GET_MODE_SIZE (mode) / 4 <= 8) -- return true; -+ return !flag_omit_frame_pointer || regno != FRAME_POINTER_REGNUM; - } - else if (ADDRESS_REGNO_P (regno)) - { - if (regno + GET_MODE_SIZE (mode) / 4 <= 16) -- return true; -+ return !flag_omit_frame_pointer || regno != FRAME_POINTER_REGNUM; - } - else if (FP_REGNO_P (regno)) - { -@@ -5259,6 +5298,13 @@ m68k_secondary_reload_class (enum reg_class rclass, - machine_mode mode, rtx x) - { - int regno; -+#ifdef TARGET_AMIGA -+ /* SBF: check for baserel's const pic_ref -+ * and return ADDR_REGS or NO_REGS -+ */ -+ if (!MEM_P(x) && amiga_is_const_pic_ref(x)) -+ return rclass == ADDR_REGS ? NO_REGS : ADDR_REGS; -+#endif - - regno = true_regnum (x); - -diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md -index f5b63f43c372..24332476b91b 100644 ---- gcc/config/m68k/m68k.md -+++ gcc/config/m68k/m68k.md -@@ -128,13 +128,11 @@ - (UNSPECV_TAS_2 4) - ]) - --;; Registers by name. -+;; Registers by name. SBF: Do not define PIC_REG / A6_REG here! - (define_constants - [(D0_REG 0) - (A0_REG 8) - (A1_REG 9) -- (PIC_REG 13) -- (A6_REG 14) - (SP_REG 15) - (FP0_REG 16) - ]) -@@ -502,7 +500,7 @@ - [(set (cc0) - (compare (match_operand:SI 0 "nonimmediate_operand" "rKT,rKs,mr,ma,>") - (match_operand:SI 1 "general_operand" "mr,ma,KTr,Ksr,>")))] -- "!TARGET_COLDFIRE" -+ "!TARGET_COLDFIRE && (flag_pic < 3 || GET_CODE(operands[1]) != CONST || GET_CODE(XEXP(operands[1], 0)) != PLUS || !REG_P(XEXP(XEXP(operands[1], 0), 0)) || REGNO(XEXP(XEXP(operands[1], 0), 0)) != PIC_REG)" - { - if (GET_CODE (operands[0]) == MEM && GET_CODE (operands[1]) == MEM) - return "cmpm%.l %1,%0"; -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index 539d5f0bf934..74403a50bb67 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -578,3 +578,26 @@ amigaos_prelink_hook((const char **)(LD1_ARGV), (STRIP)) - - // this disables tree_loop_distribute_patterns - #define C_COMMON_OVERRIDE_OPTIONS flag_no_builtin = 1 -+/* Baserel support. */ -+ -+extern int amiga_is_const_pic_ref(const_rtx x); -+ -+#undef CONSTANT_ADDRESS_P -+#define CONSTANT_ADDRESS_P(X) \ -+((GET_CODE (X) == LABEL_REF || GET_CODE (X) == SYMBOL_REF \ -+ || GET_CODE (X) == CONST_INT || GET_CODE (X) == CONST \ -+ || GET_CODE (X) == HIGH \ -+ ) && !amiga_is_const_pic_ref(X)) -+ -+ -+/* Given that symbolic_operand(X), return TRUE if no special -+ base relative relocation is necessary */ -+ -+#define LEGITIMATE_BASEREL_OPERAND_P(X) \ -+ (flag_pic >= 3 && read_only_operand (X)) -+ -+#undef LEGITIMATE_PIC_OPERAND_P -+#define LEGITIMATE_PIC_OPERAND_P(X) ( \ -+ ! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X)) -+ -+// (GET_CODE(X) == CONST && (GET_CODE(XEXP(X, 0)) == SYMBOL_REF || GET_CODE(XEXP(X, 0)) == LABEL_REF) && !CONSTANT_POOL_ADDRESS_P (XEXP(X, 0))) || -diff --git a/gcc/config/m68k/predicates.md b/gcc/config/m68k/predicates.md -index 186436c42b77..9533e65ceaab 100644 ---- gcc/config/m68k/predicates.md -+++ gcc/config/m68k/predicates.md -@@ -30,6 +30,10 @@ - || GET_CODE (XEXP (op, 0)) == LABEL_REF - || GET_CODE (XEXP (op, 0)) == CONST)) - return 1; -+#ifdef TARGET_AMIGA -+ if (flag_pic >= 3 && amiga_is_const_pic_ref(op)) -+ return 0; -+#endif - return general_operand (op, mode); - }) - - -From e74ef22307cef4b728ea06a9bb78f24d3c7879d6 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 20 Mar 2017 22:47:47 +0100 -Subject: [PATCH 033/303] @R improved register renamingRegister renaming now - updates the register ref count. Also the stack variable creation is scheduled - later, to omitt push/pop of unused variables.The regs d0/a0 are preferred and - rarely renamed. - ---- - gcc/calls.c | 2 +- - gcc/config/m68k/amigaos.c | 9 +++++ - gcc/config/m68k/amigaos.h | 5 +++ - gcc/config/m68k/m68k.c | 12 ++++--- - gcc/config/m68k/m68k.h | 10 +++--- - gcc/df-scan.c | 7 ++++ - gcc/doc/tm.texi | 4 +++ - gcc/doc/tm.texi.in | 2 ++ - gcc/expr.c | 2 +- - gcc/passes.def | 6 ++-- - gcc/regrename.c | 84 +++++++++++++++++++++++++++-------------------- - gcc/target.def | 19 +++++++++++ - gcc/targhooks.c | 7 ++++ - gcc/targhooks.h | 1 + - 14 files changed, 120 insertions(+), 50 deletions(-) - -diff --git a/gcc/calls.c b/gcc/calls.c -index 730d82e65cf3..c78059fb5199 100644 ---- gcc/calls.c -+++ gcc/calls.c -@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" --#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple.h" - #include "predict.h" -+#include "tm_p.h" - #include "stringpool.h" - #include "expmed.h" - #include "optabs.h" -diff --git a/gcc/config/m68k/amigaos.c b/gcc/config/m68k/amigaos.c -index 81d08245b580..88205e25476e 100644 ---- gcc/config/m68k/amigaos.c -+++ gcc/config/m68k/amigaos.c -@@ -824,3 +824,12 @@ read_only_operand (rtx operand) - return 1; - } - -+reg_class_t -+amiga_preferred_rename_class2(reg_class_t rclass ATTRIBUTE_UNUSED, int regno ) -+{ -+ if (regno == 0) -+ return D0_REGS; -+ if (regno == 8) -+ return A0_REGS; -+ return regno_reg_class[regno]; -+} -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index 9820f0ed1219..7259611edc9e 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -489,3 +489,8 @@ amigaos_rtx_costs (rtx, machine_mode, int, int, int *, bool); - && GET_CODE(XEXP(XEXP(x, 0), 1)) == CONST \ - && GET_CODE(XEXP(XEXP(XEXP(x, 0), 1), 0)) == UNSPEC \ - ) -+ -+#undef TARGET_PREFERRED_RENAME_CLASS2 -+#define TARGET_PREFERRED_RENAME_CLASS2 amiga_preferred_rename_class2 -+reg_class_t -+amiga_preferred_rename_class2(reg_class_t, int); -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index 64dcbf6969ee..d60371a92bc6 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -801,9 +801,11 @@ m68k_compute_frame_layout (void) - - /* Only compute the frame once per function. - Don't cache information until reload has been completed. */ -- if (current_frame.funcdef_no == current_function_funcdef_no -- && reload_completed) -- return; -+ /* SBF: No. Register renaming may free some variables, -+ * => compute it again and again... */ -+// if (current_frame.funcdef_no == current_function_funcdef_no -+// && reload_completed) -+// return; - - current_frame.size = (get_frame_size () + 3) & -4; - -@@ -5272,12 +5274,12 @@ m68k_regno_mode_ok (int regno, machine_mode mode) - { - /* Data Registers, can hold aggregate if fits in. */ - if (regno + GET_MODE_SIZE (mode) / 4 <= 8) -- return !flag_omit_frame_pointer || regno != FRAME_POINTER_REGNUM; -+ return true; - } - else if (ADDRESS_REGNO_P (regno)) - { - if (regno + GET_MODE_SIZE (mode) / 4 <= 16) -- return !flag_omit_frame_pointer || regno != FRAME_POINTER_REGNUM; -+ return !frame_pointer_needed || regno != FRAME_POINTER_REGNUM; - } - else if (FP_REGNO_P (regno)) - { -diff --git a/gcc/config/m68k/m68k.h b/gcc/config/m68k/m68k.h -index 74d5aa042059..5142adf24e4d 100644 ---- gcc/config/m68k/m68k.h -+++ gcc/config/m68k/m68k.h -@@ -440,8 +440,8 @@ along with GCC; see the file COPYING3. If not see - /* The m68k has three kinds of registers, so eight classes would be - a complete set. One of them is not needed. */ - enum reg_class { -- NO_REGS, DATA_REGS, -- ADDR_REGS, FP_REGS, -+ NO_REGS, DATA_REGS, D0_REGS, -+ ADDR_REGS, A0_REGS, FP_REGS, - GENERAL_REGS, DATA_OR_FP_REGS, - ADDR_OR_FP_REGS, ALL_REGS, - LIM_REG_CLASSES }; -@@ -449,8 +449,8 @@ enum reg_class { - #define N_REG_CLASSES (int) LIM_REG_CLASSES - - #define REG_CLASS_NAMES \ -- { "NO_REGS", "DATA_REGS", \ -- "ADDR_REGS", "FP_REGS", \ -+ { "NO_REGS", "DATA_REGS", "D0_REGS" \ -+ "ADDR_REGS", "A0_REGS", "FP_REGS", \ - "GENERAL_REGS", "DATA_OR_FP_REGS", \ - "ADDR_OR_FP_REGS", "ALL_REGS" } - -@@ -458,7 +458,9 @@ enum reg_class { - { \ - {0x00000000}, /* NO_REGS */ \ - {0x000000ff}, /* DATA_REGS */ \ -+ {0x00000001}, /* D0_REGS */ \ - {0x0100ff00}, /* ADDR_REGS */ \ -+ {0x00000100}, /* A0_REGS */ \ - {0x00ff0000}, /* FP_REGS */ \ - {0x0100ffff}, /* GENERAL_REGS */ \ - {0x00ff00ff}, /* DATA_OR_FP_REGS */ \ -diff --git a/gcc/df-scan.c b/gcc/df-scan.c -index 98de84405428..b0ef0813d07d 100644 ---- gcc/df-scan.c -+++ gcc/df-scan.c -@@ -1807,6 +1807,13 @@ df_ref_change_reg_with_loc_1 (struct df_reg_info *old_df, - df_ref *ref_ptr; - struct df_insn_info *insn_info = DF_REF_INSN_INFO (the_ref); - -+ if (DF_REF_FLAGS_IS_SET(the_ref, DF_HARD_REG_LIVE)) -+ { -+ if (DF_REF_REGNO(the_ref) < FIRST_PSEUDO_REGISTER) -+ --df->hard_regs_live_count[DF_REF_REGNO(the_ref)]; -+ ++df->hard_regs_live_count[new_regno]; -+ } -+ - DF_REF_REGNO (the_ref) = new_regno; - DF_REF_REG (the_ref) = regno_reg_rtx[new_regno]; - -diff --git a/gcc/doc/tm.texi b/gcc/doc/tm.texi -index 745910f9a331..6604514427fa 100644 ---- gcc/doc/tm.texi -+++ gcc/doc/tm.texi -@@ -2489,6 +2489,10 @@ only if neither labeling works. - A target hook that places additional preference on the register class to use when it is necessary to rename a register in class @var{rclass} to another class, or perhaps @var{NO_REGS}, if no preferred register class is found or hook @code{preferred_rename_class} is not implemented. Sometimes returning a more restrictive class makes better code. For example, on ARM, thumb-2 instructions using @code{LO_REGS} may be smaller than instructions using @code{GENERIC_REGS}. By returning @code{LO_REGS} from @code{preferred_rename_class}, code size can be reduced. - @end deftypefn - -+@deftypefn {Target Hook} reg_class_t TARGET_PREFERRED_RENAME_CLASS2 (reg_class_t @var{rclass}, int @var{regno}) -+A target hook that places additional preference on the register class to use when it is necessary to rename a register in class @var{rclass} to another class, or perhaps @var{NO_REGS}, if no preferred register class is found or hook @code{preferred_rename_class2} is not implemented. Sometimes returning a more restrictive class makes better code. For example, on ARM, thumb-2 instructions using @code{LO_REGS} may be smaller than instructions using @code{GENERIC_REGS}. By returning @code{LO_REGS} from @code{preferred_rename_class2}, code size can be reduced. -+@end deftypefn -+ - @deftypefn {Target Hook} reg_class_t TARGET_PREFERRED_RELOAD_CLASS (rtx @var{x}, reg_class_t @var{rclass}) - A target hook that places additional restrictions on the register class - to use when it is necessary to copy value @var{x} into a register in class -diff --git a/gcc/doc/tm.texi.in b/gcc/doc/tm.texi.in -index f31c763991c5..e4da2a94249b 100644 ---- gcc/doc/tm.texi.in -+++ gcc/doc/tm.texi.in -@@ -2281,6 +2281,8 @@ only if neither labeling works. - - @hook TARGET_PREFERRED_RENAME_CLASS - -+@hook TARGET_PREFERRED_RENAME_CLASS2 -+ - @hook TARGET_PREFERRED_RELOAD_CLASS - - @defmac PREFERRED_RELOAD_CLASS (@var{x}, @var{class}) -diff --git a/gcc/expr.c b/gcc/expr.c -index 01fe6437da12..6260f5ed7ed2 100644 ---- gcc/expr.c -+++ gcc/expr.c -@@ -21,12 +21,12 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" --#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple.h" - #include "predict.h" -+#include "tm_p.h" - #include "ssa.h" - #include "expmed.h" - #include "optabs.h" -diff --git a/gcc/passes.def b/gcc/passes.def -index 7aed14445429..ec796082ae7f 100644 ---- gcc/passes.def -+++ gcc/passes.def -@@ -447,9 +447,6 @@ along with GCC; see the file COPYING3. If not see - NEXT_PASS (pass_ree); - NEXT_PASS (pass_compare_elim_after_reload); - NEXT_PASS (pass_branch_target_load_optimize1); -- NEXT_PASS (pass_thread_prologue_and_epilogue); -- NEXT_PASS (pass_rtl_dse2); -- NEXT_PASS (pass_stack_adjustments); - NEXT_PASS (pass_jump2); - NEXT_PASS (pass_duplicate_computed_gotos); - NEXT_PASS (pass_sched_fusion); -@@ -457,6 +454,9 @@ along with GCC; see the file COPYING3. If not see - NEXT_PASS (pass_if_after_reload); - NEXT_PASS (pass_regrename); - NEXT_PASS (pass_cprop_hardreg); -+ NEXT_PASS (pass_thread_prologue_and_epilogue); -+ NEXT_PASS (pass_rtl_dse2); -+ NEXT_PASS (pass_stack_adjustments); - NEXT_PASS (pass_fast_rtl_dce); - NEXT_PASS (pass_reorder_blocks); - NEXT_PASS (pass_branch_target_load_optimize2); -diff --git a/gcc/regrename.c b/gcc/regrename.c -index df4c320700c5..ca7e24774afd 100644 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -370,32 +370,31 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - - /* Compute preferred rename class of super union of all the classes - in the chain. */ -- preferred_class -- = (enum reg_class) targetm.preferred_rename_class (super_class); -+ preferred_class = (enum reg_class) targetm.preferred_rename_class2 ( -+ super_class, old_reg); - - /* Pick and check the register from the tied chain iff the tied chain -- is not renamed. */ -+ is not renamed. */ - if (this_head->tied_chain && !this_head->tied_chain->renamed -- && check_new_reg_p (old_reg, this_head->tied_chain->regno, -- this_head, *unavailable)) -+ && check_new_reg_p (old_reg, this_head->tied_chain->regno, this_head, -+ *unavailable)) - return this_head->tied_chain->regno; - - /* If PREFERRED_CLASS is not NO_REGS, we iterate in the first pass -- over registers that belong to PREFERRED_CLASS and try to find the -- best register within the class. If that failed, we iterate in -- the second pass over registers that don't belong to the class. -- If PREFERRED_CLASS is NO_REGS, we iterate over all registers in -- ascending order without any preference. */ -+ over registers that belong to PREFERRED_CLASS and try to find the -+ best register within the class. If that failed, we iterate in -+ the second pass over registers that don't belong to the class. -+ If PREFERRED_CLASS is NO_REGS, we iterate over all registers in -+ ascending order without any preference. */ - has_preferred_class = (preferred_class != NO_REGS); -- for (pass = (has_preferred_class ? 0 : 1); pass < 2; pass++) - { - int new_reg; - for (new_reg = 0; new_reg < FIRST_PSEUDO_REGISTER; new_reg++) - { - if (has_preferred_class -- && (pass == 0) -- != TEST_HARD_REG_BIT (reg_class_contents[preferred_class], -- new_reg)) -+ && 0 -+ == TEST_HARD_REG_BIT(reg_class_contents[preferred_class], -+ new_reg)) - continue; - - if (!check_new_reg_p (old_reg, new_reg, this_head, *unavailable)) -@@ -405,17 +404,13 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - return new_reg; - - /* In the first pass, we force the renaming of registers that -- don't belong to PREFERRED_CLASS to registers that do, even -- though the latters were used not very long ago. -- Also use a register if no best_new_reg was found till now */ -- if (((pass == 0) -- && !TEST_HARD_REG_BIT (reg_class_contents[preferred_class], -- best_new_reg)) -- || tick[best_new_reg] > tick[new_reg]) -+ don't belong to PREFERRED_CLASS to registers that do, even -+ though the latters were used not very long ago. -+ Also use a register if no best_new_reg was found till now */ -+ if ((tick[best_new_reg] > tick[new_reg] -+ || (old_reg == best_new_reg && new_reg < old_reg))) - best_new_reg = new_reg; - } -- if (pass == 0 && best_new_reg != old_reg) -- break; - } - return best_new_reg; - } -@@ -955,7 +950,7 @@ regrename_analyze (bitmap bb_mask) - numbering in its subpatterns. */ - - bool --regrename_do_replace (struct du_head *head, int reg) -+regrename_do_replace (struct du_head *head, int regno) - { - struct du_chain *chain; - unsigned int base_regno = head->regno; -@@ -963,19 +958,20 @@ regrename_do_replace (struct du_head *head, int reg) - - for (chain = head->first; chain; chain = chain->next_use) - { -- unsigned int regno = ORIGINAL_REGNO (*chain->loc); -- struct reg_attrs *attr = REG_ATTRS (*chain->loc); -- int reg_ptr = REG_POINTER (*chain->loc); -+ unsigned int orig_regno = ORIGINAL_REGNO(*chain->loc); -+ struct reg_attrs *attr = REG_ATTRS(*chain->loc); -+ int reg_ptr = REG_POINTER(*chain->loc); - - if (DEBUG_INSN_P (chain->insn) && REGNO (*chain->loc) != base_regno) -- validate_change (chain->insn, &(INSN_VAR_LOCATION_LOC (chain->insn)), -- gen_rtx_UNKNOWN_VAR_LOC (), true); -+ validate_change (chain->insn, &(INSN_VAR_LOCATION_LOC(chain->insn)), -+ gen_rtx_UNKNOWN_VAR_LOC (), -+ true); - else - { -- validate_change (chain->insn, chain->loc, -- gen_raw_REG (GET_MODE (*chain->loc), reg), true); -- if (regno >= FIRST_PSEUDO_REGISTER) -- ORIGINAL_REGNO (*chain->loc) = regno; -+ validate_change (chain->insn, chain->loc, -+ gen_raw_REG (GET_MODE(*chain->loc), regno), true); -+ if (orig_regno >= FIRST_PSEUDO_REGISTER) -+ ORIGINAL_REGNO (*chain->loc) = orig_regno; - REG_ATTRS (*chain->loc) = attr; - REG_POINTER (*chain->loc) = reg_ptr; - } -@@ -984,10 +980,26 @@ regrename_do_replace (struct du_head *head, int reg) - if (!apply_change_group ()) - return false; - -- mode = GET_MODE (*head->first->loc); -+ mode = GET_MODE(*head->first->loc); - head->renamed = 1; -- head->regno = reg; -- head->nregs = hard_regno_nregs[reg][mode]; -+ head->regno = regno; -+ head->nregs = hard_regno_nregs[regno][mode]; -+ -+ /* SBF: also update the current df info, move from base_regno -> regno. */ -+ for (chain = head->first; chain; chain = chain->next_use) -+ { -+ /* undo regno patch - will be patched again */ -+ if (REGNO (*chain->loc) == regno) -+ SET_REGNO(*chain->loc, base_regno); -+ df_ref_change_reg_with_loc (*chain->loc, regno); -+ -+ SET_REGNO(*chain->loc, regno); -+ } -+ -+ /* Mark the old regno as no longer used. */ -+ if (!df->hard_regs_live_count[base_regno]) -+ df_set_regs_ever_live (base_regno, false); -+ - return true; - } - -diff --git a/gcc/target.def b/gcc/target.def -index 20f2b32da1e9..d0208812d83b 100644 ---- gcc/target.def -+++ gcc/target.def -@@ -5170,6 +5170,25 @@ DEFHOOK - reg_class_t, (reg_class_t rclass), - default_preferred_rename_class) - -+/*A target hook that places additional preference on the register -+ class -+ */ -+DEFHOOK -+(preferred_rename_class2, -+ "A target hook that places additional preference on the register\ -+ class to use when it is necessary to rename a register in class\ -+ @var{rclass} to another class, or perhaps @var{NO_REGS}, if no\ -+ preferred register class is found or hook @code{preferred_rename_class2}\ -+ is not implemented.\ -+ Sometimes returning a more restrictive class makes better code. For\ -+ example, on ARM, thumb-2 instructions using @code{LO_REGS} may be\ -+ smaller than instructions using @code{GENERIC_REGS}. By returning\ -+ @code{LO_REGS} from @code{preferred_rename_class2}, code size can\ -+ be reduced.", -+ reg_class_t, (reg_class_t rclass, int regno), -+ default_preferred_rename_class2) -+ -+ - /* This target hook allows the backend to avoid unsafe substitution - during register allocation. */ - DEFHOOK -diff --git a/gcc/targhooks.c b/gcc/targhooks.c -index a34227705d2b..e106af7b261d 100644 ---- gcc/targhooks.c -+++ gcc/targhooks.c -@@ -1542,6 +1542,13 @@ default_preferred_rename_class (reg_class_t rclass ATTRIBUTE_UNUSED) - return NO_REGS; - } - -+/* The default implementation of TARGET_PREFERRED_RENAME_CLASS2. */ -+reg_class_t -+default_preferred_rename_class2 (reg_class_t rclass, int regno ATTRIBUTE_UNUSED) -+{ -+ return targetm.preferred_rename_class(rclass); -+} -+ - /* The default implementation of TARGET_CLASS_LIKELY_SPILLED_P. */ - - bool -diff --git a/gcc/targhooks.h b/gcc/targhooks.h -index 7687c39b53b5..0a21ef982a65 100644 ---- gcc/targhooks.h -+++ gcc/targhooks.h -@@ -204,6 +204,7 @@ extern bool default_profile_before_prologue (void); - extern reg_class_t default_preferred_reload_class (rtx, reg_class_t); - extern reg_class_t default_preferred_output_reload_class (rtx, reg_class_t); - extern reg_class_t default_preferred_rename_class (reg_class_t rclass); -+extern reg_class_t default_preferred_rename_class2 (reg_class_t rclass, int regno); - extern bool default_class_likely_spilled_p (reg_class_t); - extern unsigned char default_class_max_nregs (reg_class_t, machine_mode); - - -From 6b9057baef40c5661b35c995f764401a82fcf9b7 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 20 Mar 2017 23:11:56 +0100 -Subject: [PATCH 034/303] @B fix include order - ---- - gcc/function.c | 2 +- - gcc/var-tracking.c | 2 +- - 2 files changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/function.c b/gcc/function.c -index e903b1bcdf65..c614f9b9c000 100644 ---- gcc/function.c -+++ gcc/function.c -@@ -35,11 +35,11 @@ along with GCC; see the file COPYING3. If not see - #include "system.h" - #include "coretypes.h" - #include "backend.h" --#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" - #include "gimple-expr.h" -+#include "tm_p.h" - #include "cfghooks.h" - #include "df.h" - #include "stringpool.h" -diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c -index 149c0c123804..ab9c0117b078 100644 ---- gcc/var-tracking.c -+++ gcc/var-tracking.c -@@ -89,10 +89,10 @@ - #include "system.h" - #include "coretypes.h" - #include "backend.h" --#include "tm_p.h" - #include "target.h" - #include "rtl.h" - #include "tree.h" -+#include "tm_p.h" - #include "cfghooks.h" - #include "alloc-pool.h" - #include "tree-pass.h" - -From 1176f20fb5eb00f735a1c1ad2bb9d005fdac44aa Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Tue, 21 Mar 2017 00:15:07 +0100 -Subject: [PATCH 035/303] @B fix pssible NPE - ---- - gcc/regrename.c | 19 +++++++++++-------- - 1 file changed, 11 insertions(+), 8 deletions(-) - -diff --git a/gcc/regrename.c b/gcc/regrename.c -index ca7e24774afd..4a9b4c2735a1 100644 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -986,15 +986,18 @@ regrename_do_replace (struct du_head *head, int regno) - head->nregs = hard_regno_nregs[regno][mode]; - - /* SBF: also update the current df info, move from base_regno -> regno. */ -- for (chain = head->first; chain; chain = chain->next_use) -- { -- /* undo regno patch - will be patched again */ -- if (REGNO (*chain->loc) == regno) -- SET_REGNO(*chain->loc, base_regno); -- df_ref_change_reg_with_loc (*chain->loc, regno); -+ if (base_regno < FIRST_PSEUDO_REGISTER && regno < FIRST_PSEUDO_REGISTER) -+ for (chain = head->first; chain; chain = chain->next_use) -+ { -+ if (DEBUG_INSN_P (chain->insn)) -+ continue; -+ /* undo regno patch - will be patched again */ -+ if (REGNO (*chain->loc) == regno) -+ SET_REGNO(*chain->loc, base_regno); -+ df_ref_change_reg_with_loc (*chain->loc, regno); - -- SET_REGNO(*chain->loc, regno); -- } -+ SET_REGNO(*chain->loc, regno); -+ } - - /* Mark the old regno as no longer used. */ - if (!df->hard_regs_live_count[base_regno]) - -From 5844c3b50f6c2e52c83592a41e570603450d47b4 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 22 Mar 2017 15:48:28 +0100 -Subject: [PATCH 036/303] @B decrement ref count correctly - ---- - gcc/df-scan.c | 3 +-- - 1 file changed, 1 insertion(+), 2 deletions(-) - -diff --git a/gcc/df-scan.c b/gcc/df-scan.c -index b0ef0813d07d..1f23452afe19 100644 ---- gcc/df-scan.c -+++ gcc/df-scan.c -@@ -1809,8 +1809,7 @@ df_ref_change_reg_with_loc_1 (struct df_reg_info *old_df, - - if (DF_REF_FLAGS_IS_SET(the_ref, DF_HARD_REG_LIVE)) - { -- if (DF_REF_REGNO(the_ref) < FIRST_PSEUDO_REGISTER) -- --df->hard_regs_live_count[DF_REF_REGNO(the_ref)]; -+ --df->hard_regs_live_count[DF_REF_REGNO(the_ref)]; - ++df->hard_regs_live_count[new_regno]; - } - - -From e9a9e3005a6160dc5e9a4338c5516f3787e657da Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 22 Mar 2017 15:49:15 +0100 -Subject: [PATCH 037/303] @I cleanup - ---- - gcc/regrename.c | 40 ++++++++++++++++++---------------------- - 1 file changed, 18 insertions(+), 22 deletions(-) - -diff --git a/gcc/regrename.c b/gcc/regrename.c -index 4a9b4c2735a1..2dd96db5b87f 100644 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -356,8 +356,8 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - { - bool has_preferred_class; - enum reg_class preferred_class; -- int pass; - int best_new_reg = old_reg; -+ int new_reg; - - /* Further narrow the set of registers we can use for renaming. - If the chain needs a call-saved register, mark the call-used -@@ -387,30 +387,26 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - If PREFERRED_CLASS is NO_REGS, we iterate over all registers in - ascending order without any preference. */ - has_preferred_class = (preferred_class != NO_REGS); -+ for (new_reg = 0; new_reg < FIRST_PSEUDO_REGISTER; new_reg++) - { -- int new_reg; -- for (new_reg = 0; new_reg < FIRST_PSEUDO_REGISTER; new_reg++) -- { -- if (has_preferred_class -- && 0 -- == TEST_HARD_REG_BIT(reg_class_contents[preferred_class], -- new_reg)) -- continue; -+ if (has_preferred_class -+ && !TEST_HARD_REG_BIT(reg_class_contents[preferred_class], -+ new_reg)) -+ continue; - -- if (!check_new_reg_p (old_reg, new_reg, this_head, *unavailable)) -- continue; -+ if (!check_new_reg_p (old_reg, new_reg, this_head, *unavailable)) -+ continue; - -- if (!best_rename) -- return new_reg; -+ if (!best_rename) -+ return new_reg; - -- /* In the first pass, we force the renaming of registers that -- don't belong to PREFERRED_CLASS to registers that do, even -- though the latters were used not very long ago. -- Also use a register if no best_new_reg was found till now */ -- if ((tick[best_new_reg] > tick[new_reg] -- || (old_reg == best_new_reg && new_reg < old_reg))) -- best_new_reg = new_reg; -- } -+ /* In the first pass, we force the renaming of registers that -+ don't belong to PREFERRED_CLASS to registers that do, even -+ though the latters were used not very long ago. -+ Also use a register if no best_new_reg was found till now */ -+ if ((tick[best_new_reg] > tick[new_reg] -+ || (old_reg == best_new_reg && new_reg < old_reg))) -+ best_new_reg = new_reg; - } - return best_new_reg; - } -@@ -989,7 +985,7 @@ regrename_do_replace (struct du_head *head, int regno) - if (base_regno < FIRST_PSEUDO_REGISTER && regno < FIRST_PSEUDO_REGISTER) - for (chain = head->first; chain; chain = chain->next_use) - { -- if (DEBUG_INSN_P (chain->insn)) -+ if (DEBUG_INSN_P (chain->insn) && VAR_LOC_UNKNOWN_P(INSN_VAR_LOCATION_LOC(chain->insn))) - continue; - /* undo regno patch - will be patched again */ - if (REGNO (*chain->loc) == regno) - -From ed41bbc9c042c73e2c423a93d98b6c83988fc8e3 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 22 Mar 2017 16:02:57 +0100 -Subject: [PATCH 038/303] @R -ftree-loop-vectorize and -ftree-slp-vectorize are - no longer enabled with -O3 - ---- - gcc/opts.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/gcc/opts.c b/gcc/opts.c -index 0f9431a0b323..28a617c0f14f 100644 ---- gcc/opts.c -+++ gcc/opts.c -@@ -530,8 +530,10 @@ static const struct default_options default_options_table[] = - { OPT_LEVELS_1_PLUS_NOT_DEBUG, OPT_finline_functions_called_once, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_funswitch_loops, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_fgcse_after_reload, NULL, 1 }, -+#ifndef TARGET_AMIGA - { OPT_LEVELS_3_PLUS, OPT_ftree_loop_vectorize, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_ftree_slp_vectorize, NULL, 1 }, -+#endif - { OPT_LEVELS_3_PLUS, OPT_fvect_cost_model_, NULL, VECT_COST_MODEL_DYNAMIC }, - { OPT_LEVELS_3_PLUS, OPT_fipa_cp_clone, NULL, 1 }, - { OPT_LEVELS_3_PLUS, OPT_ftree_partial_pre, NULL, 1 }, - -From 25f75fe3179ceb6da6f50b1c30d8fe810c1ccccd Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 22 Mar 2017 16:05:51 +0100 -Subject: [PATCH 039/303] @N added a new combine optimization.i2 something -> - regi3 reg -> somewherewithi4 compare reg, const_0is replaced with: something - -> somewhere, if the reg is dead at the comparison - ---- - gcc/combine.c | 60 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - 1 file changed, 60 insertions(+) - -diff --git a/gcc/combine.c b/gcc/combine.c -index 75c6229766c0..333f8fef9655 100644 ---- gcc/combine.c -+++ gcc/combine.c -@@ -102,6 +102,7 @@ along with GCC; see the file COPYING3. If not see - #include "valtrack.h" - #include "rtl-iter.h" - #include "print-rtl.h" -+#include "conditions.h" - - #ifndef LOAD_EXTEND_OP - #define LOAD_EXTEND_OP(M) UNKNOWN -@@ -2578,6 +2579,7 @@ static rtx_insn * - try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - int *new_direct_jump_p, rtx_insn *last_combined_insn) - { -+ rtx_insn * del4 = 0; - /* New patterns for I3 and I2, respectively. */ - rtx newpat, newi2pat = 0; - rtvec newpat_vec_with_clobbers = 0; -@@ -3350,6 +3352,52 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - substed_i0 = 1; - } - -+#if HAVE_cc0 -+ /* SBF: This is an attempt to combine -+ * i2 something -> reg -+ * i3 reg -> somewhere -+ * with the next insn i4 -+ * i4 compare reg, 0 -+ * -+ * then -+ * newpat = something -> somewhere -+ * -+ * If the comparison with 0 is already done in the insn newpat -+ * and the reg is dead at the compare insn -+ * then perform the combine and mark the compare as deleted. -+ */ -+ if (i2dest_killed && !i0 && !i1 && i2pat && i2_is_used + added_sets_2 > 1 -+ && NEXT_INSN(i3)) -+ { -+ rtx_insn *next = NEXT_INSN(i3); -+ rtx setn = single_set(next); -+ if (setn) -+ { -+ rtx srcn = SET_SRC(setn); -+ if (GET_CODE(srcn) == COMPARE) -+ { -+ rtx dstn = XEXP(srcn, 0); -+ srcn = XEXP(srcn, 1); -+ -+ if (CONST_INT_P(srcn) && INTVAL(srcn) == 0 -+ && find_reg_note(next, REG_DEAD, dstn)) -+ { -+ /* now check via NOTICE_UPDATE_CC*/ -+ NOTICE_UPDATE_CC(PATTERN(i2), i2); -+ if (cc_status.flags == 0 && rtx_equal_p(dstn, cc_status.value1)) -+ { -+ added_sets_2 = 0; -+ i2_is_used = 0; -+ -+ /* perform deletion later, if all other checks are ok. */ -+ del4 = next; -+ } -+ } -+ } -+ } -+ } -+#endif -+ - /* Fail if an autoincrement side-effect has been duplicated. Be careful - to count all the ways that I2SRC and I1SRC can be used. */ - if ((FIND_REG_INC_NOTE (i2, NULL_RTX) != 0 -@@ -4387,6 +4435,18 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - move_deaths (newi2pat, NULL_RTX, from_luid, i2, &midnotes); - move_deaths (newpat, newi2pat, from_luid, i3, &midnotes); - -+ /* SBF: perform the deletion of the next insn, if marked. */ -+ if (del4) -+ { -+ int del_from_luid = DF_INSN_LUID(del4); -+ LOG_LINKS(del4) = NULL; -+ REG_NOTES(del4) = 0; -+ SET_INSN_DELETED(del4); -+ if (newi2pat) -+ move_deaths(newi2pat, NULL_RTX, del_from_luid, del4, &midnotes); -+ move_deaths(newpat, NULL_RTX, del_from_luid, del4, &midnotes); -+ } -+ - /* Distribute all the LOG_LINKS and REG_NOTES from I1, I2, and I3. */ - if (i3notes) - distribute_notes (i3notes, i3, i3, newi2pat ? i2 : NULL, - -From 464f34464d1abdb6e5dfcab0e78e12e15ca133b5 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 23 Mar 2017 16:12:37 +0100 -Subject: [PATCH 040/303] @B added further constraints to optimize the compare - away - ---- - gcc/combine.c | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/gcc/combine.c b/gcc/combine.c -index 333f8fef9655..1103521f9cf1 100644 ---- gcc/combine.c -+++ gcc/combine.c -@@ -2598,7 +2598,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - I2 and not in I3, a REG_DEAD note must be made. */ - rtx i3dest_killed = 0; - /* SET_DEST and SET_SRC of I2, I1 and I0. */ -- rtx i2dest = 0, i2src = 0, i1dest = 0, i1src = 0, i0dest = 0, i0src = 0; -+ rtx i3src = 0, i2dest = 0, i2src = 0, i1dest = 0, i1src = 0, i0dest = 0, i0src = 0; - /* Copy of SET_SRC of I1 and I0, if needed. */ - rtx i1src_copy = 0, i0src_copy = 0, i0src_copy2 = 0; - /* Set if I2DEST was reused as a scratch register. */ -@@ -2632,6 +2632,9 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - if (i1 == i2 || i0 == i2 || (i0 && i0 == i1)) - return 0; - -+ if (single_set(i3)) -+ i3src = SET_SRC(single_set(i3)); -+ - /* Only try four-insn combinations when there's high likelihood of - success. Look for simple insns, such as loads of constants or - binary operations involving a constant. */ -@@ -3367,6 +3370,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - * then perform the combine and mark the compare as deleted. - */ - if (i2dest_killed && !i0 && !i1 && i2pat && i2_is_used + added_sets_2 > 1 -+ && rtx_equal_p(i2dest, i3src) - && NEXT_INSN(i3)) - { - rtx_insn *next = NEXT_INSN(i3); -@@ -3391,7 +3395,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - - /* perform deletion later, if all other checks are ok. */ - del4 = next; -- } -+ } - } - } - } -@@ -4438,10 +4442,13 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - /* SBF: perform the deletion of the next insn, if marked. */ - if (del4) - { -+// rtx set = SET_SRC(single_set(del4)); -+ - int del_from_luid = DF_INSN_LUID(del4); - LOG_LINKS(del4) = NULL; - REG_NOTES(del4) = 0; -- SET_INSN_DELETED(del4); -+ SET_INSN_DELETED(del4); -+// XEXP(set, 0) = XEXP(set, 1); - if (newi2pat) - move_deaths(newi2pat, NULL_RTX, del_from_luid, del4, &midnotes); - move_deaths(newpat, NULL_RTX, del_from_luid, del4, &midnotes); - -From 704efeb80a44bf883699e620c4b51eef32d9659c Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 24 Mar 2017 17:05:33 +0100 -Subject: [PATCH 041/303] @N support -ramiga-... stuff - ---- - gcc/config/m68k/amigaos.opt | 12 ++++++++++++ - 1 file changed, 12 insertions(+) - -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 4d9a42052355..f985cf5e2845 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -7,6 +7,18 @@ noixemul - Target RejectNegative - Do not use ixemul.library - use libnix instead to link - -+ramiga-lib -+Target RejectNegative -+Use libinit.o as start file -+ -+ramiga-libr -+Target RejectNegative -+Use libinitr.o as start file -+ -+ramiga-dev -+Target RejectNegative -+Use devinit.o as start file -+ - msmall-code - Target RejectNegative Var(flag_smallcode,1) - small code model - -From d62a4d349a55a59aa9d8b9a3f02827d66be960b4 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 24 Mar 2017 17:06:31 +0100 -Subject: [PATCH 042/303] @R make exception section name configurable by TARGET - ---- - gcc/config/m68k/m68kamigaos.h | 6 ++++++ - gcc/except.c | 4 ++-- - gcc/target-def.h | 8 ++++++++ - 3 files changed, 16 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index 74403a50bb67..ececc6d76498 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -601,3 +601,9 @@ extern int amiga_is_const_pic_ref(const_rtx x); - ! symbolic_operand (X, VOIDmode) || LEGITIMATE_BASEREL_OPERAND_P (X)) - - // (GET_CODE(X) == CONST && (GET_CODE(XEXP(X, 0)) == SYMBOL_REF || GET_CODE(XEXP(X, 0)) == LABEL_REF) && !CONSTANT_POOL_ADDRESS_P (XEXP(X, 0))) || -+ -+#undef TARGET_GCC_EXCEPT_TABLE -+#define TARGET_GCC_EXCEPT_TABLE ".data" -+ -+#undef TARGET_GCC_EXCEPT_TABLE_S -+#define TARGET_GCC_EXCEPT_TABLE_S ".data" -diff --git a/gcc/except.c b/gcc/except.c -index 2a1073f80cc4..156d7b76d249 100644 ---- gcc/except.c -+++ gcc/except.c -@@ -2850,14 +2850,14 @@ switch_to_exception_section (const char * ARG_UNUSED (fnname)) - it linkonce if we have COMDAT groups to tie them together. */ - if (DECL_COMDAT_GROUP (current_function_decl) && HAVE_COMDAT_GROUP) - flags |= SECTION_LINKONCE; -- sprintf (section_name, ".gcc_except_table.%s", fnname); -+ sprintf (section_name, TARGET_GCC_EXCEPT_TABLE_S, fnname); - s = get_section (section_name, flags, current_function_decl); - free (section_name); - } - else - #endif - exception_section -- = s = get_section (".gcc_except_table", flags, NULL); -+ = s = get_section (TARGET_GCC_EXCEPT_TABLE, flags, NULL); - } - else - exception_section -diff --git a/gcc/target-def.h b/gcc/target-def.h -index ec5e09e568e6..9fbfde121095 100644 ---- gcc/target-def.h -+++ gcc/target-def.h -@@ -108,3 +108,11 @@ - #include "hooks.h" - #include "targhooks.h" - #include "insn-target-def.h" -+ -+#ifndef TARGET_GCC_EXCEPT_TABLE -+#define TARGET_GCC_EXCEPT_TABLE ".gcc_except_table" -+#endif -+ -+#ifndef TARGET_GCC_EXCEPT_TABLE_S -+#define TARGET_GCC_EXCEPT_TABLE_S ".gcc_except_table.%s" -+#endif - -From bd6fbbbc0a587184db27e691e05a795e1abdeaf6 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 24 Mar 2017 17:07:18 +0100 -Subject: [PATCH 043/303] @R build libstdc++-v3 with noiexmul - ---- - libstdc++-v3/configure | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure -index 44ba3aca42af..d61b41b2fb7c 100755 ---- libstdc++-v3/configure -+++ libstdc++-v3/configure -@@ -8636,6 +8636,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. - lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ enable_shared=no -+ CXXFLAGS="$CXXFLAGS -noixemul" - ;; - esac - ;; - -From f05e1e6bd5a30ee7dfea2399acf268771c986767 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sat, 25 Mar 2017 23:11:55 +0100 -Subject: [PATCH 044/303] @R move all EH data into .text section - ---- - gcc/config/m68k/m68kamigaos.h | 7 +++++-- - gcc/dwarf2out.c | 2 +- - 2 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/gcc/config/m68k/m68kamigaos.h b/gcc/config/m68k/m68kamigaos.h -index ececc6d76498..68f3277bd87c 100644 ---- gcc/config/m68k/m68kamigaos.h -+++ gcc/config/m68k/m68kamigaos.h -@@ -603,7 +603,10 @@ extern int amiga_is_const_pic_ref(const_rtx x); - // (GET_CODE(X) == CONST && (GET_CODE(XEXP(X, 0)) == SYMBOL_REF || GET_CODE(XEXP(X, 0)) == LABEL_REF) && !CONSTANT_POOL_ADDRESS_P (XEXP(X, 0))) || - - #undef TARGET_GCC_EXCEPT_TABLE --#define TARGET_GCC_EXCEPT_TABLE ".data" -+#define TARGET_GCC_EXCEPT_TABLE ".text" - - #undef TARGET_GCC_EXCEPT_TABLE_S --#define TARGET_GCC_EXCEPT_TABLE_S ".data" -+#define TARGET_GCC_EXCEPT_TABLE_S ".text" -+ -+#define EH_TABLES_CAN_BE_READ_ONLY 1 -+ -diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c -index 995ae7f18758..2740e417b0b2 100644 ---- gcc/dwarf2out.c -+++ gcc/dwarf2out.c -@@ -451,7 +451,7 @@ switch_to_eh_frame_section (bool back ATTRIBUTE_UNUSED) - /*global=*/1); - lsda_encoding = ASM_PREFERRED_EH_DATA_FORMAT (/*code=*/0, - /*global=*/0); -- flags = ((! flag_pic -+ flags = (( (!flag_pic || flag_pic > 2) - || ((fde_encoding & 0x70) != DW_EH_PE_absptr - && (fde_encoding & 0x70) != DW_EH_PE_aligned - && (per_encoding & 0x70) != DW_EH_PE_absptr - -From 3be02d432149821fde6d3de2eca3830943c9dfc1 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 26 Mar 2017 20:49:43 +0200 -Subject: [PATCH 045/303] @R patches to work with amigaos-*-m68k - ---- - libstdc++-v3/configure.host | 5 +++++ - libstdc++-v3/include/c_global/cstdio | 2 -- - 2 files changed, 5 insertions(+), 2 deletions(-) - -diff --git a/libstdc++-v3/configure.host b/libstdc++-v3/configure.host -index 304a7f5aff61..354b1c7ead46 100644 ---- libstdc++-v3/configure.host -+++ libstdc++-v3/configure.host -@@ -226,6 +226,11 @@ case "${host_os}" in - os_include_dir="os/generic" - atomicity_dir="cpu/generic" - ;; -+ amiga*) -+ os_include_dir="os/newlib" -+ CXXFLAGS="${CXXFLAGS} -noixemul" -+ CPPFLAGS="${CPPFLAGS} -noixemul" -+ ;; - bsd*) - # Plain BSD attempts to share FreeBSD files. - os_include_dir="os/bsd/freebsd" -diff --git a/libstdc++-v3/include/c_global/cstdio b/libstdc++-v3/include/c_global/cstdio -index 522d065d4dc6..86d524f96a62 100644 ---- libstdc++-v3/include/c_global/cstdio -+++ libstdc++-v3/include/c_global/cstdio -@@ -149,9 +149,7 @@ namespace std - #if _GLIBCXX_USE_C99_STDIO - - #undef snprintf --#ifndef AMIGA - #undef vfscanf --#endif - #undef vscanf - #undef vsnprintf - #undef vsscanf - -From 1a1c3869ddd0e8e75eef0849dcd0b060dd26cbbd Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sun, 26 Mar 2017 20:50:20 +0200 -Subject: [PATCH 046/303] @R patches to work with amigaos-*-m68k - ---- - libobjc/configure | 3 ++- - libobjc/objc/objc.h | 4 ++++ - 2 files changed, 6 insertions(+), 1 deletion(-) - -diff --git a/libobjc/configure b/libobjc/configure -index 55fcc33dbe2d..a60258f422d8 100755 ---- libobjc/configure -+++ libobjc/configure -@@ -7637,7 +7637,8 @@ $as_echo_n "checking for $compiler option to produce PIC... " >&6; } - # FIXME: we need at least 68020 code to build shared libraries, but - # adding the `-m68020' flag to GCC prevents building anything better, - # like `-m68040'. -- lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ #lt_prog_compiler_pic='-m68020 -resident32 -malways-restore-a4' -+ enable_shared=no - ;; - esac - ;; -diff --git a/libobjc/objc/objc.h b/libobjc/objc/objc.h -index 37391a446bb0..6c73f53290e8 100644 ---- libobjc/objc/objc.h -+++ libobjc/objc/objc.h -@@ -52,7 +52,11 @@ extern "C" { - Important: this could change and we could switch to 'typedef bool - BOOL' in the future. Do not depend on the type of BOOL. */ - #undef BOOL -+#ifdef AMIGA -+typedef short BOOL; -+#else - typedef unsigned char BOOL; -+#endif - - #define YES (BOOL)1 - #define NO (BOOL)0 - -From 7f8948f412f79fb2efd6835a3062720c1b34febf Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 29 Mar 2017 18:08:05 +0200 -Subject: [PATCH 047/303] @B fix for possible corrupted code, due to combine - optimization. Maybe incorrect... - ---- - gcc/reload1.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/gcc/reload1.c b/gcc/reload1.c -index c2800f8cb790..7f386a3aaab0 100644 ---- gcc/reload1.c -+++ gcc/reload1.c -@@ -7943,7 +7943,8 @@ do_input_reload (struct insn_chain *chain, struct reload *rl, int j) - AUTO_INC reload if reload_out is set but reload_out_reg isn't. */ - && (! reload_inherited[j] || (rl->out && ! rl->out_reg)) - && ! rtx_equal_p (reg_rtx, old) -- && reg_rtx != 0) -+ && reg_rtx != 0 -+ && rl->in_reg != rl->out_reg) - emit_input_reload_insns (chain, rld + j, old, j); - - /* When inheriting a wider reload, we have a MEM in rl->in, - -From 709da5eaf06c7d9d1aa3332feab227469be4cc48 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 30 Mar 2017 11:29:16 +0200 -Subject: [PATCH 048/303] @B remove optimization The side effects are not - solved yet, so this experiment is removed from the 'stable' branch - ---- - gcc/combine.c | 69 +---------------------------------------------------------- - gcc/reload1.c | 3 +-- - 2 files changed, 2 insertions(+), 70 deletions(-) - -diff --git a/gcc/combine.c b/gcc/combine.c -index 1103521f9cf1..75c6229766c0 100644 ---- gcc/combine.c -+++ gcc/combine.c -@@ -102,7 +102,6 @@ along with GCC; see the file COPYING3. If not see - #include "valtrack.h" - #include "rtl-iter.h" - #include "print-rtl.h" --#include "conditions.h" - - #ifndef LOAD_EXTEND_OP - #define LOAD_EXTEND_OP(M) UNKNOWN -@@ -2579,7 +2578,6 @@ static rtx_insn * - try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - int *new_direct_jump_p, rtx_insn *last_combined_insn) - { -- rtx_insn * del4 = 0; - /* New patterns for I3 and I2, respectively. */ - rtx newpat, newi2pat = 0; - rtvec newpat_vec_with_clobbers = 0; -@@ -2598,7 +2596,7 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - I2 and not in I3, a REG_DEAD note must be made. */ - rtx i3dest_killed = 0; - /* SET_DEST and SET_SRC of I2, I1 and I0. */ -- rtx i3src = 0, i2dest = 0, i2src = 0, i1dest = 0, i1src = 0, i0dest = 0, i0src = 0; -+ rtx i2dest = 0, i2src = 0, i1dest = 0, i1src = 0, i0dest = 0, i0src = 0; - /* Copy of SET_SRC of I1 and I0, if needed. */ - rtx i1src_copy = 0, i0src_copy = 0, i0src_copy2 = 0; - /* Set if I2DEST was reused as a scratch register. */ -@@ -2632,9 +2630,6 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - if (i1 == i2 || i0 == i2 || (i0 && i0 == i1)) - return 0; - -- if (single_set(i3)) -- i3src = SET_SRC(single_set(i3)); -- - /* Only try four-insn combinations when there's high likelihood of - success. Look for simple insns, such as loads of constants or - binary operations involving a constant. */ -@@ -3355,53 +3350,6 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - substed_i0 = 1; - } - --#if HAVE_cc0 -- /* SBF: This is an attempt to combine -- * i2 something -> reg -- * i3 reg -> somewhere -- * with the next insn i4 -- * i4 compare reg, 0 -- * -- * then -- * newpat = something -> somewhere -- * -- * If the comparison with 0 is already done in the insn newpat -- * and the reg is dead at the compare insn -- * then perform the combine and mark the compare as deleted. -- */ -- if (i2dest_killed && !i0 && !i1 && i2pat && i2_is_used + added_sets_2 > 1 -- && rtx_equal_p(i2dest, i3src) -- && NEXT_INSN(i3)) -- { -- rtx_insn *next = NEXT_INSN(i3); -- rtx setn = single_set(next); -- if (setn) -- { -- rtx srcn = SET_SRC(setn); -- if (GET_CODE(srcn) == COMPARE) -- { -- rtx dstn = XEXP(srcn, 0); -- srcn = XEXP(srcn, 1); -- -- if (CONST_INT_P(srcn) && INTVAL(srcn) == 0 -- && find_reg_note(next, REG_DEAD, dstn)) -- { -- /* now check via NOTICE_UPDATE_CC*/ -- NOTICE_UPDATE_CC(PATTERN(i2), i2); -- if (cc_status.flags == 0 && rtx_equal_p(dstn, cc_status.value1)) -- { -- added_sets_2 = 0; -- i2_is_used = 0; -- -- /* perform deletion later, if all other checks are ok. */ -- del4 = next; -- } -- } -- } -- } -- } --#endif -- - /* Fail if an autoincrement side-effect has been duplicated. Be careful - to count all the ways that I2SRC and I1SRC can be used. */ - if ((FIND_REG_INC_NOTE (i2, NULL_RTX) != 0 -@@ -4439,21 +4387,6 @@ try_combine (rtx_insn *i3, rtx_insn *i2, rtx_insn *i1, rtx_insn *i0, - move_deaths (newi2pat, NULL_RTX, from_luid, i2, &midnotes); - move_deaths (newpat, newi2pat, from_luid, i3, &midnotes); - -- /* SBF: perform the deletion of the next insn, if marked. */ -- if (del4) -- { --// rtx set = SET_SRC(single_set(del4)); -- -- int del_from_luid = DF_INSN_LUID(del4); -- LOG_LINKS(del4) = NULL; -- REG_NOTES(del4) = 0; -- SET_INSN_DELETED(del4); --// XEXP(set, 0) = XEXP(set, 1); -- if (newi2pat) -- move_deaths(newi2pat, NULL_RTX, del_from_luid, del4, &midnotes); -- move_deaths(newpat, NULL_RTX, del_from_luid, del4, &midnotes); -- } -- - /* Distribute all the LOG_LINKS and REG_NOTES from I1, I2, and I3. */ - if (i3notes) - distribute_notes (i3notes, i3, i3, newi2pat ? i2 : NULL, -diff --git a/gcc/reload1.c b/gcc/reload1.c -index 7f386a3aaab0..c2800f8cb790 100644 ---- gcc/reload1.c -+++ gcc/reload1.c -@@ -7943,8 +7943,7 @@ do_input_reload (struct insn_chain *chain, struct reload *rl, int j) - AUTO_INC reload if reload_out is set but reload_out_reg isn't. */ - && (! reload_inherited[j] || (rl->out && ! rl->out_reg)) - && ! rtx_equal_p (reg_rtx, old) -- && reg_rtx != 0 -- && rl->in_reg != rl->out_reg) -+ && reg_rtx != 0) - emit_input_reload_insns (chain, rld + j, old, j); - - /* When inheriting a wider reload, we have a MEM in rl->in, - -From c44d7bced301829dbab55b307545a7e029e69e6f Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 30 Mar 2017 20:44:57 +0200 -Subject: [PATCH 049/303] @N added a separate optimization pass - ---- - gcc/Makefile.in | 1 + - gcc/bbb-opts.c | 401 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - gcc/passes.c | 27 ++++ - gcc/passes.def | 1 + - gcc/regrename.c | 9 +- - gcc/tree-pass.h | 1 + - 6 files changed, 437 insertions(+), 3 deletions(-) - create mode 100755 gcc/bbb-opts.c - mode change 100644 => 100755 gcc/regrename.c - -diff --git a/gcc/Makefile.in b/gcc/Makefile.in -index 575d308907cc..dc01aeef0f0c 100644 ---- gcc/Makefile.in -+++ gcc/Makefile.in -@@ -1199,6 +1199,7 @@ OBJS = \ - auto-inc-dec.o \ - auto-profile.o \ - bb-reorder.o \ -+ bbb-opts.o \ - bitmap.o \ - bt-load.o \ - builtins.o \ -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -new file mode 100755 -index 000000000000..ff447c9e335e ---- /dev/null -+++ gcc/bbb-opts.c -@@ -0,0 +1,401 @@ -+/* Bebbo's Optimizations. -+ Copyright (C) 2010-2016 Free Software Foundation, Inc. -+ -+ This file is part of GCC. -+ -+ GCC is free software; you can redistribute it and/or modify it under -+ the terms of the GNU General Public License as published by the Free -+ Software Foundation; either version 3, or (at your option) any later -+ version. -+ -+ GCC is distributed in the hope that it will be useful, but WITHOUT ANY -+ WARRANTY; without even the implied warranty of MERCHANTABILITY or -+ FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License -+ for more details. -+ -+ You should have received a copy of the GNU General Public License -+ along with GCC; see the file COPYING3. If not see -+ <http://www.gnu.org/licenses/>. */ -+ -+/** -+ * SBF (Stefan "Bebbo" Franke): -+ * -+ * This pass performs multiple optimizations. -+ * -+ * #1 propagate_moves -+ * check if a->b->a can be moved out of a loop. -+ * -+ * #2 strcpy -+ * move a,reg -+ * move reg,b -+ * cmp #0,reg -+ * jne/jeq -+ */ -+ -+#include "config.h" -+#include "system.h" -+#include "coretypes.h" -+#include "backend.h" -+#include "target.h" -+#include "rtl.h" -+#include "df.h" -+#include "tm_p.h" -+#include "insn-config.h" -+#include "recog.h" -+#include "cfgrtl.h" -+#include "emit-rtl.h" -+#include "tree-pass.h" -+#include "conditions.h" -+#include <vector> -+#include <map> -+ -+extern void -+dump_insns (char const * name); -+ -+/* -+ * #1 propagate a->b->a moves out of a loop. -+ * -+ * consider a loop: -+ * -+ * .L1 -+ * ... -+ * move d0, a0 ; (1) -+ * ... -+ * move xy, (a0)+ -+ * ... -+ * move a0, d0 ; (2) -+ * ... -+ * jxx .L1 -+ * -+ * Then the statements (1) and (2) can be moved out of the loop: -+ * -+ * move d0, a0 ; (3) -+ * .L1 -+ * ... -+ * move *, (a0)+ ; a0 is modified somehow -+ * ... -+ * jxx .L1 -+ * move a0, d0 ; (4) -+ * -+ * if all criteria are met: -+ * -+ * a) no other jump to .L1 -> (LABEL_NUSES(insn) == 1) -+ * b) no other use of d0 inside the loop -+ * c) no other use of a0 before (1) -+ * d) no other use of a1 after (2) -+ * -+ * Optional: -+ * - omit (4) if d0 is dead -+ * -+ * this will e.g. convert -+ .L6: -+ move.l d0,a1 -+ move.b (a1)+,d1 -+ move.l a1,d0 -+ move.b d1,(a0)+ -+ cmp.b #0, d1 -+ jne .L6 -+ * to -+ move.l d0,a1 -+ .L6: -+ move.b (a1)+,d1 -+ move.b d1,(a0)+ -+ cmp.b #0, d1 -+ jne .L6 -+ * -+ */ -+static int -+propagate_moves () -+{ -+ rtx_insn *insn, *next; -+ rtx_insn * current_label = 0; -+ int change_count = 0; -+ std -+ ::vector<rtx_insn *> reg_reg; -+ -+ for (insn = get_insns (); insn; insn = next) -+ { -+ next = NEXT_INSN (insn); -+ -+ if (DEBUG_INSN_P(insn)) -+ continue; -+ -+ if (LABEL_P(insn)) -+ { -+ if (LABEL_NUSES(insn) == 1) -+ { -+ current_label = insn; -+ reg_reg.clear (); -+ } -+ else -+ current_label = 0; -+ } -+ -+ if (current_label == 0) -+ continue; -+ -+ if (NONJUMP_INSN_P(insn)) -+ { -+ // check for set reg, reg -+ rtx set = single_set (insn); -+ if (set) -+ { -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); -+ if (REG_P(src) && REG_P(dst)) -+ reg_reg.push_back (insn); -+ } -+ continue; -+ } -+ -+ if (JUMP_P(insn)) -+ { -+ if (JUMP_LABEL (insn) == current_label && reg_reg.size () > 1) -+ { -+ /* Search for reg/reg pairs. */ -+ for (auto i = reg_reg.begin (); -+ i != reg_reg.end () && i + 1 != reg_reg.end ();) -+ { -+ bool inc = true; -+ for (auto j = i + 1; j != reg_reg.end ();) -+ { -+ rtx seti = single_set (*i); -+ rtx srci = SET_SRC(seti); -+ rtx dsti = SET_DEST(seti); -+ rtx setj = single_set (*j); -+ rtx srcj = SET_SRC(setj); -+ rtx dstj = SET_DEST(setj); -+ -+ if (rtx_equal_p (srci, dstj) && rtx_equal_p (srcj, dsti)) -+ { -+ /* Ensure correct usage. */ -+ if (!reg_used_between_p (srci, current_label, *i) -+ && !reg_used_between_p (srci, *i, *j) -+ && !reg_used_between_p (srci, *j, insn) -+ && !reg_used_between_p (dsti, current_label, *i) -+ && !reg_used_between_p (dsti, *j, insn)) -+ { -+ fprintf (stderr, -+ "condition met, moving regs %d, %d\n", -+ REGNO(srci), REGNO(dsti)); -+ -+ /* Move out of loop. */ -+ remove_insn (*i); -+ if (PREV_INSN (current_label)) -+ add_insn_after (*i, PREV_INSN (current_label), -+ 0); -+ else -+ add_insn_before (*i, current_label, 0); -+ -+ remove_insn (*j); -+ add_insn_after (*j, insn, 0); -+ -+ reg_reg.erase (j); -+ reg_reg.erase (i); -+ j = reg_reg.end (); -+ inc = false; -+ -+ ++change_count; -+ } -+ } -+ if (inc) -+ ++j; -+ } -+ if (inc) -+ ++i; -+ } -+ } -+ current_label = 0; -+ } -+ } -+ -+ return change_count; -+} -+ -+/** -+ * Search for -+ * -+ * mov x,reg -+ * mov reg,x -+ * cmp #0, reg -+ * jxx -+ * -+ * patterns. -+ * -+ * Use a simple state machine to find the patterns. -+ */ -+static void -+opt_strcpy () -+{ -+ rtx_insn *insn, *next; -+ rtx_insn * x2reg = 0; -+ rtx_insn * reg2x; -+ unsigned int regno; -+ -+ for (insn = get_insns (); insn; insn = next) -+ { -+ rtx src; -+ -+ next = NEXT_INSN (insn); -+ -+ if (NONJUMP_INSN_P(insn)) -+ { -+ rtx set = single_set (insn); -+ if (!set) -+ continue; -+ -+ if (x2reg && reg2x) -+ { -+ src = SET_SRC(set); -+ if (GET_CODE(src) == COMPARE) -+ { -+ rtx dst = XEXP(src, 0); -+ src = XEXP(src, 1); -+ -+ if (CONST_INT_P(src) && INTVAL(src) == 0 -+ && find_reg_note (insn, REG_DEAD, dst)) -+ { -+ /* now check via NOTICE_UPDATE_CC*/ -+ NOTICE_UPDATE_CC (PATTERN (reg2x), reg2x); -+ if (cc_status.flags == 0 -+ && rtx_equal_p (dst, cc_status.value2)) -+ { -+ int num_clobbers_to_add = 0; -+ int insn_code_number; -+ -+ SET_SRC(single_set(reg2x)) = SET_SRC( -+ single_set (x2reg)); -+ insn_code_number = recog (PATTERN (reg2x), reg2x, -+ &num_clobbers_to_add); -+ -+ if (insn_code_number < 0) -+ { -+ /* restore register. */ -+ SET_SRC(single_set(reg2x)) = SET_DEST( -+ single_set (x2reg)); -+ } -+ else -+ { -+ -+ rtx link; -+ -+ fprintf ( -+ stderr, -+ "condition met, removing compare and joining insns - omit reg %d\n", -+ REGNO(dst)); -+ -+ for (link = REG_NOTES(x2reg); link; -+ link = XEXP(link, 1)) -+ if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) -+ { -+ if (GET_CODE (link) == EXPR_LIST) -+ add_reg_note ( -+ reg2x, REG_NOTE_KIND(link), -+ copy_insn_1 (XEXP(link, 0))); -+ else -+ add_shallow_copy_of_reg_note (reg2x, -+ link); -+ } -+ -+ SET_INSN_DELETED(x2reg); -+ SET_INSN_DELETED(insn); -+ -+ df_insn_rescan (reg2x); -+ -+ } -+ } -+ } -+ x2reg = 0; -+ continue; -+ } -+ reg2x = 0; -+ } -+ -+ /* check for reg2x first, maybe fallback to x2reg. */ -+ if (x2reg && reg2x == 0) -+ { -+ if (REG_P(SET_SRC(set)) && REGNO(SET_SRC(set)) == regno) -+ { -+ reg2x = insn; -+ continue; -+ } -+ x2reg = 0; -+ } -+ -+ /* check for a match for x2reg. */ -+ if (x2reg == 0) -+ { -+ if (REG_P(SET_DEST(set))) -+ { -+ x2reg = insn; -+ reg2x = 0; -+ regno = REGNO(SET_DEST(set)); -+ } -+ } -+ } -+ } -+} -+ -+/* Main entry point to the pass. */ -+ -+static unsigned int -+execute_bbb_optimizations (void) -+{ -+ df_set_flags (DF_LR_RUN_DCE + DF_DEFER_INSN_RESCAN); -+ df_note_add_problem (); -+ df_analyze (); -+ -+// dump_insns ("bbb 0"); -+ -+ propagate_moves (); -+ -+ opt_strcpy (); -+ -+ dump_insns ("bbb 1"); -+ -+ return 0; -+} -+ -+namespace -+ { -+ -+ const pass_data pass_data_bbb_optimizations = -+ { -+ RTL_PASS, /* type */ -+ "bbb", /* name */ -+ OPTGROUP_NONE, /* optinfo_flags */ -+ TV_NONE, /* tv_id */ -+ 0, /* properties_required */ -+ 0, /* properties_provided */ -+ 0, /* properties_destroyed */ -+ 0, /* todo_flags_start */ -+ ( TODO_df_finish | TODO_df_verify ), /* todo_flags_finish */ -+ }; -+ -+ class pass_bbb_optimizations : public rtl_opt_pass -+ { -+ public: -+ pass_bbb_optimizations (gcc::context *ctxt) -+ : rtl_opt_pass (pass_data_bbb_optimizations, ctxt) -+ {} -+ -+ /* opt_pass methods: */ -+ virtual bool gate (function *) -+ { -+ return true; -+ } -+ -+ virtual unsigned int execute (function *) -+ { -+ return execute_bbb_optimizations (); -+ } -+ -+ }; // class pass_bbb_optimizations -+ -+ } // anon namespace -+ -+rtl_opt_pass * -+make_pass_bbb_optimizations (gcc::context *ctxt) -+ { -+ return new pass_bbb_optimizations (ctxt); -+ } -diff --git a/gcc/passes.c b/gcc/passes.c -index e89618111245..321adbc61e2d 100644 ---- gcc/passes.c -+++ gcc/passes.c -@@ -2269,6 +2269,31 @@ override_gate_status (opt_pass *pass, tree func, bool gate_status) - } - - -+void dump_insns(char const * name) -+{ -+ rtx_insn *insn, *next; -+ fprintf(stderr, "====================================\npass: %s\n", name); -+ for (insn = get_insns(); insn; insn = next) -+ { -+ next = NEXT_INSN(insn); -+ debug_rtx(insn); -+#if 0 -+ if (NONJUMP_INSN_P (insn)) -+ { -+ rtx x, y, set= single_set (insn); -+ if (!set) -+ continue; -+ x = y = SET_SRC(set); -+ -+ while (GET_CODE(y) == CONST || GET_CODE(y) == PLUS) -+ y = XEXP(y, 0); -+ if (x != y && REG_P(y) && REGNO(y) == PIC_REG) -+ debug_rtx(insn); -+ } -+#endif -+ } -+} -+ - /* Execute PASS. */ - - bool -@@ -2278,6 +2303,8 @@ execute_one_pass (opt_pass *pass) - - bool gate_status; - -+// dump_insns(pass->name); -+ - /* IPA passes are executed on whole program, so cfun should be NULL. - Other passes need function context set. */ - if (pass->type == SIMPLE_IPA_PASS || pass->type == IPA_PASS) -diff --git a/gcc/passes.def b/gcc/passes.def -index ec796082ae7f..45ff86c383e4 100644 ---- gcc/passes.def -+++ gcc/passes.def -@@ -446,6 +446,7 @@ along with GCC; see the file COPYING3. If not see - NEXT_PASS (pass_split_after_reload); - NEXT_PASS (pass_ree); - NEXT_PASS (pass_compare_elim_after_reload); -+ NEXT_PASS (pass_bbb_optimizations); - NEXT_PASS (pass_branch_target_load_optimize1); - NEXT_PASS (pass_jump2); - NEXT_PASS (pass_duplicate_computed_gotos); -diff --git a/gcc/regrename.c b/gcc/regrename.c -old mode 100644 -new mode 100755 -index 2dd96db5b87f..4ba825e8d8e8 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -358,6 +358,7 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - enum reg_class preferred_class; - int best_new_reg = old_reg; - int new_reg; -+ int hit = 0; - - /* Further narrow the set of registers we can use for renaming. - If the chain needs a call-saved register, mark the call-used -@@ -404,9 +405,11 @@ find_rename_reg (du_head_p this_head, enum reg_class super_class, - don't belong to PREFERRED_CLASS to registers that do, even - though the latters were used not very long ago. - Also use a register if no best_new_reg was found till now */ -- if ((tick[best_new_reg] > tick[new_reg] -- || (old_reg == best_new_reg && new_reg < old_reg))) -- best_new_reg = new_reg; -+ if (new_reg < old_reg || !hit) -+ { -+ hit = 1; -+ best_new_reg = new_reg; -+ } - } - return best_new_reg; - } -diff --git a/gcc/tree-pass.h b/gcc/tree-pass.h -index 5f5055d3a6c1..b3f66ad529b9 100644 ---- gcc/tree-pass.h -+++ gcc/tree-pass.h -@@ -590,6 +590,7 @@ extern rtl_opt_pass *make_pass_branch_target_load_optimize2 (gcc::context - *ctxt); - extern rtl_opt_pass *make_pass_leaf_regs (gcc::context *ctxt); - extern rtl_opt_pass *make_pass_split_before_sched2 (gcc::context *ctxt); -+extern rtl_opt_pass *make_pass_bbb_optimizations (gcc::context *ctxt); - extern rtl_opt_pass *make_pass_compare_elim_after_reload (gcc::context *ctxt); - extern rtl_opt_pass *make_pass_sched2 (gcc::context *ctxt); - extern rtl_opt_pass *make_pass_stack_regs (gcc::context *ctxt); - -From eb051946c1a720575b80bcd5cf8038710f1c27c1 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 31 Mar 2017 11:19:56 +0200 -Subject: [PATCH 050/303] @B compiles again with other targets - ---- - gcc/bbb-opts.c | 205 ++++++++++++++++++++++++++++++++++----------------------- - gcc/except.c | 1 + - 2 files changed, 124 insertions(+), 82 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index ff447c9e335e..aeec7a8b4e6a 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -107,11 +107,10 @@ dump_insns (char const * name); - static int - propagate_moves () - { -+ int change_count = 0; - rtx_insn *insn, *next; - rtx_insn * current_label = 0; -- int change_count = 0; -- std -- ::vector<rtx_insn *> reg_reg; -+ std::vector<rtx_insn *> reg_reg; - - for (insn = get_insns (); insn; insn = next) - { -@@ -153,11 +152,11 @@ propagate_moves () - if (JUMP_LABEL (insn) == current_label && reg_reg.size () > 1) - { - /* Search for reg/reg pairs. */ -- for (auto i = reg_reg.begin (); -+ for (std::vector<rtx_insn *>::iterator i = reg_reg.begin (); - i != reg_reg.end () && i + 1 != reg_reg.end ();) - { - bool inc = true; -- for (auto j = i + 1; j != reg_reg.end ();) -+ for (std::vector<rtx_insn *>::iterator j = i + 1; j != reg_reg.end ();) - { - rtx seti = single_set (*i); - rtx srci = SET_SRC(seti); -@@ -208,7 +207,6 @@ propagate_moves () - current_label = 0; - } - } -- - return change_count; - } - -@@ -224,9 +222,11 @@ propagate_moves () - * - * Use a simple state machine to find the patterns. - */ --static void -+static int - opt_strcpy () - { -+ int change_count = 0; -+#if HAVE_cc0 - rtx_insn *insn, *next; - rtx_insn * x2reg = 0; - rtx_insn * reg2x; -@@ -234,106 +234,145 @@ opt_strcpy () - - for (insn = get_insns (); insn; insn = next) - { -- rtx src; -- - next = NEXT_INSN (insn); - -- if (NONJUMP_INSN_P(insn)) -- { -- rtx set = single_set (insn); -- if (!set) -- continue; -+ if (!NONJUMP_INSN_P(insn)) -+ continue; -+ -+ rtx set = single_set (insn); -+ if (!set) -+ continue; - -- if (x2reg && reg2x) -+ if (x2reg && reg2x) -+ { -+ rtx src = SET_SRC(set); -+ if (GET_CODE(src) == COMPARE) - { -- src = SET_SRC(set); -- if (GET_CODE(src) == COMPARE) -- { -- rtx dst = XEXP(src, 0); -- src = XEXP(src, 1); -+ rtx dst = XEXP(src, 0); -+ src = XEXP(src, 1); - -- if (CONST_INT_P(src) && INTVAL(src) == 0 -- && find_reg_note (insn, REG_DEAD, dst)) -+ if (CONST_INT_P(src) && INTVAL(src) == 0 -+ && find_reg_note (insn, REG_DEAD, dst)) -+ { -+ /* now check via NOTICE_UPDATE_CC*/ -+ NOTICE_UPDATE_CC (PATTERN (reg2x), reg2x); -+ if (cc_status.flags == 0 -+ && rtx_equal_p (dst, cc_status.value2)) - { -- /* now check via NOTICE_UPDATE_CC*/ -- NOTICE_UPDATE_CC (PATTERN (reg2x), reg2x); -- if (cc_status.flags == 0 -- && rtx_equal_p (dst, cc_status.value2)) -- { -- int num_clobbers_to_add = 0; -- int insn_code_number; -+ int num_clobbers_to_add = 0; -+ int insn_code_number; - -- SET_SRC(single_set(reg2x)) = SET_SRC( -- single_set (x2reg)); -- insn_code_number = recog (PATTERN (reg2x), reg2x, -- &num_clobbers_to_add); -+ SET_SRC(single_set(reg2x)) = SET_SRC(single_set (x2reg)); -+ insn_code_number = recog (PATTERN (reg2x), reg2x, -+ &num_clobbers_to_add); - -- if (insn_code_number < 0) -- { -- /* restore register. */ -- SET_SRC(single_set(reg2x)) = SET_DEST( -- single_set (x2reg)); -- } -- else -- { -+ if (insn_code_number < 0) -+ { -+ /* restore register. */ -+ SET_SRC(single_set(reg2x)) = SET_DEST( -+ single_set (x2reg)); -+ } -+ else -+ { - -- rtx link; -+ rtx link; - -- fprintf ( -- stderr, -- "condition met, removing compare and joining insns - omit reg %d\n", -- REGNO(dst)); -+ fprintf ( -+ stderr, -+ "condition met, removing compare and joining insns - omit reg %d\n", -+ REGNO(dst)); - -- for (link = REG_NOTES(x2reg); link; -- link = XEXP(link, 1)) -- if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) -- { -- if (GET_CODE (link) == EXPR_LIST) -- add_reg_note ( -- reg2x, REG_NOTE_KIND(link), -- copy_insn_1 (XEXP(link, 0))); -- else -- add_shallow_copy_of_reg_note (reg2x, -- link); -- } -+ for (link = REG_NOTES(x2reg); link; -+ link = XEXP(link, 1)) -+ if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) -+ { -+ if (GET_CODE (link) == EXPR_LIST) -+ add_reg_note (reg2x, REG_NOTE_KIND(link), -+ copy_insn_1 (XEXP(link, 0))); -+ else -+ add_shallow_copy_of_reg_note (reg2x, link); -+ } - -- SET_INSN_DELETED(x2reg); -- SET_INSN_DELETED(insn); -+ SET_INSN_DELETED(x2reg); -+ SET_INSN_DELETED(insn); - -- df_insn_rescan (reg2x); -+ df_insn_rescan (reg2x); - -- } -+ ++change_count; - } - } -- x2reg = 0; -- continue; - } -- reg2x = 0; -+ x2reg = 0; -+ continue; - } -+ reg2x = 0; -+ } - -- /* check for reg2x first, maybe fallback to x2reg. */ -- if (x2reg && reg2x == 0) -+ /* check for reg2x first, maybe fallback to x2reg. */ -+ if (x2reg && reg2x == 0) -+ { -+ if (REG_P(SET_SRC(set)) && REGNO(SET_SRC(set)) == regno) - { -- if (REG_P(SET_SRC(set)) && REGNO(SET_SRC(set)) == regno) -- { -- reg2x = insn; -- continue; -- } -- x2reg = 0; -+ reg2x = insn; -+ continue; - } -+ x2reg = 0; -+ } - -- /* check for a match for x2reg. */ -- if (x2reg == 0) -+ /* check for a match for x2reg. */ -+ if (x2reg == 0) -+ { -+ if (REG_P(SET_DEST(set))) - { -- if (REG_P(SET_DEST(set))) -- { -- x2reg = insn; -- reg2x = 0; -- regno = REGNO(SET_DEST(set)); -- } -+ x2reg = insn; -+ reg2x = 0; -+ regno = REGNO(SET_DEST(set)); - } - } - } -+#endif -+ return change_count; -+} -+ -+/* -+ * Convert loops using a counting reg as offset with an address reg -+ * into a loop with auto inc address regs. -+ */ -+static int -+offset_2_autoinc (void) -+{ -+ rtx_insn *insn, *next; -+ rtx_insn * reg_const = 0; -+ int change_count = 0; -+ -+ for (insn = get_insns (); insn; insn = next) -+ { -+ next = NEXT_INSN (insn); -+ -+ if (!next || !LABEL_P(next) || LABEL_NUSES(next) != 1) -+ continue; -+ -+ if (!NONJUMP_INSN_P(insn)) -+ continue; -+ -+ rtx set = single_set (insn); -+ if (!set) -+ continue; -+ -+ rtx reg = SET_DEST(set); -+ if (!REG_P(reg)) -+ continue; -+ -+ rtx val = SET_SRC(set); -+ -+ -+// fprintf(stderr, "possible start for offset_2_autoinc\n"); -+// debug_rtx(insn); -+// debug_rtx(next); -+ -+ } -+ -+ return change_count; - } - - /* Main entry point to the pass. */ -@@ -349,9 +388,11 @@ execute_bbb_optimizations (void) - - propagate_moves (); - -+ offset_2_autoinc (); -+ - opt_strcpy (); - -- dump_insns ("bbb 1"); -+// dump_insns ("bbb 1"); - - return 0; - } -diff --git a/gcc/except.c b/gcc/except.c -index 156d7b76d249..194478f8454c 100644 ---- gcc/except.c -+++ gcc/except.c -@@ -142,6 +142,7 @@ along with GCC; see the file COPYING3. If not see - #include "cfgloop.h" - #include "builtins.h" - #include "tree-hash-traits.h" -+#include "target-def.h" - - static GTY(()) int call_site_base; - - -From 73b869461936fd68a37b9edc8f0e4eba48d5c440 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 16:03:47 +0200 -Subject: [PATCH 051/303] @R use a5 instead of fp - ---- - gcc/config/m68k/amigaos.h | 6 +----- - 1 file changed, 1 insertion(+), 5 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index 7259611edc9e..ce47723e962f 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -153,11 +153,7 @@ amiga_named_section (const char *name, unsigned int flags, tree decl); - #define FRAME_POINTER_REGNUM 13 - - #undef M68K_REGNAME --#define M68K_REGNAME(r) ( \ -- ( ((r) == FRAME_POINTER_REGNUM) \ -- && frame_pointer_needed) ? \ -- M68K_FP_REG_NAME : reg_names[(r)]) -- -+#define M68K_REGNAME(r) (reg_names[(r)]) - - /* The AmigaOS ABI does not define how structures should be returned, so, - contrary to 'm68k.h', we prefer a multithread-safe solution. */ - -From 626d238b27f86a4369aeb13ad11153accd414f90 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 16:06:55 +0200 -Subject: [PATCH 052/303] @R make MEM_P more expensive than REG_P - ---- - gcc/config/m68k/m68k.c | 30 ++++++++++++++++++++++++++++++ - 1 file changed, 30 insertions(+) - -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index d60371a92bc6..6c0d9211598d 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -2928,6 +2928,17 @@ m68k_rtx_costs (rtx x, machine_mode mode, int outer_code, - *total = COSTS_N_INSNS (TARGET_COLDFIRE ? 2 : 3); - return true; - } -+ /* reg + value */ -+// if (mode == SImode -+// && REG_P(XEXP(x, 0))) { -+// if (m68k_rtx_costs(XEXP(x, 1), mode, PLUS, 1, total, speed)) -+// { -+// if (REGNO_REG_CLASS(REGNO(XEXP(x, 0))) == ADDR_REGS) -+// *total += 4; -+// return true; -+// } -+// } -+ - return false; - - case ASHIFT: -@@ -2996,6 +3007,25 @@ m68k_rtx_costs (rtx x, machine_mode mode, int outer_code, - *total = 0; - return false; - -+ case MEM: -+ { -+ /* simple but not exact */ -+ rtx y = XEXP(x, 0); -+ int yc = GET_CODE(y); -+ if (yc == REG || yc == PRE_INC || yc == POST_INC || yc == POST_DEC) -+ *total += 4; -+ else -+ if (yc == PRE_DEC) -+ *total += 6; -+ else -+ *total += 8; -+ -+ if (mode != QImode && mode != QImode) -+ *total += 4; -+ -+ return true; -+ } -+ - default: - return false; - } - -From 9c9c8b4c31a9ed000a27ff22245ad21b7ad21e67 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 16:08:30 +0200 -Subject: [PATCH 053/303] @R added reg life analysis to own optimizer - ---- - gcc/bbb-opts.c | 793 ++++++++++++++++++++++++++++++++++++++++++++++++--------- - gcc/passes.def | 1 + - 2 files changed, 672 insertions(+), 122 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index aeec7a8b4e6a..7fd01139d0f3 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -25,11 +25,16 @@ - * #1 propagate_moves - * check if a->b->a can be moved out of a loop. - * -- * #2 strcpy -+ * #2 strcpy_opt - * move a,reg - * move reg,b - * cmp #0,reg -- * jne/jeq -+ * jcc -+ * -+ * -> -+ * move a,b -+ * jcc -+ * - */ - - #include "config.h" -@@ -49,8 +54,285 @@ - #include <vector> - #include <map> - --extern void --dump_insns (char const * name); -+/* enough for m68k. */ -+typedef unsigned insn_info; //[(FIRST_PSEUDO_REGISTER + sizeof(unsigned) * 8 - 1) / (sizeof(unsigned) * 8)]; -+ -+static inline void -+resetii (unsigned & ii) -+{ -+ ii = 0; -+} -+ -+static inline void -+setii (unsigned regno, unsigned & ii) -+{ -+ ii |= 1 << regno; -+} -+ -+static inline void -+clearii (unsigned regno, unsigned & ii) -+{ -+ ii &= ~(1 << regno); -+} -+ -+static inline bool -+getii (unsigned regno, unsigned & ii) -+{ -+ return ii & (1 << regno) ? true : false; -+} -+ -+/* scan rtx for registers. */ -+static void -+scanii (rtx x, unsigned & ii) -+{ -+ if (REG_P(x)) -+ { -+ setii (REGNO(x), ii); -+ return; -+ } -+ -+ RTX_CODE code = GET_CODE(x); -+ const char *fmt = GET_RTX_FORMAT(code); -+ for (int i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) -+ { -+ if (fmt[i] == 'e') -+ scanii (XEXP(x, i), ii); -+ else if (fmt[i] == 'E') -+ for (int j = XVECLEN (x, i) - 1; j >= 0; j--) -+ scanii (XVECEXP(x, i, j), ii); -+ } -+} -+ -+static std::vector<rtx_insn *> insns; -+static std::vector<rtx_insn *> jumps; -+static std::map<rtx_insn *, unsigned> insn2index; -+static std::vector<insn_info> infos; -+ -+static void -+clear (void) -+{ -+ insns.clear (); -+ jumps.clear (); -+ insn2index.clear (); -+ infos.clear (); -+} -+ -+static void -+dump_costs (void) -+{ -+ rtx d0 = gen_raw_REG (SImode, 0); -+ rtx d0b = gen_raw_REG (QImode, 0); -+ rtx d1 = gen_raw_REG (SImode, 1); -+ rtx d1b = gen_raw_REG (QImode, 1); -+ rtx a0 = gen_raw_REG (SImode, 8); -+ rtx a1 = gen_raw_REG (SImode, 9); -+ -+ struct ICO -+ { -+ char const * name; -+ rtx set; -+ } data[] = -+ { -+ { "move d0,(a0)", gen_rtx_SET(gen_rtx_MEM (SImode, a0), d0) }, -+ { "move a0,d0", gen_rtx_SET(d0, a0) }, -+ { "move (a0),d0", gen_rtx_SET(d0, gen_rtx_MEM (SImode, a0)) }, -+ { "move d0,(a0)", gen_rtx_SET(gen_rtx_MEM (SImode, a0), d0) }, -+ { "move d1,(a1)+", gen_rtx_SET(d1, gen_rtx_MEM (SImode, gen_rtx_POST_INC (SImode, a1))) }, -+ { "move (a0),(a1)", gen_rtx_SET(gen_rtx_MEM (SImode, a1), gen_rtx_MEM (SImode, a0)) }, -+ { 0, 0 } }, *p; -+ -+ for (p = data; p->name; ++p) -+ { -+ int cost = insn_rtx_cost (p->set, true); -+ fprintf (stderr, "%s: %d\n", p->name, cost); -+ } -+} -+ -+ -+static void -+dump_insns (char const * name) -+{ -+ rtx_insn *insn, *next; -+ fprintf(stderr, "====================================: %s\n", name); -+ for (unsigned i = 0; i < insns.size(); ++i) -+ { -+ insn_info & ii = infos[i]; -+ -+ for (int j = 0; j < 8; ++j) -+ if (getii(j, ii)) -+ fprintf(stderr, "d%d ", j); -+ -+ for (int j = 8; j < 16; ++j) -+ if (getii(j, ii)) -+ fprintf(stderr, "a%d ", j-8); -+ -+ fprintf(stderr, "\t"); -+ debug_rtx(insns[i]); -+ } -+} -+ -+ -+/* -+ * Create a filtered view of insns - keep only those to work with. -+ */ -+static void -+filter_insns () -+{ -+ rtx_insn *insn, *next; -+ clear (); -+ -+ df_insn_rescan_all (); -+ -+ /* create a vector with relevant insn. */ -+ for (insn = get_insns (); insn; insn = next) -+ { -+ next = NEXT_INSN (insn); -+ -+ if (NONJUMP_INSN_P (insn) || LABEL_P(insn) || JUMP_P(insn) || CALL_P(insn)) -+ { -+ // debug_rtx (insn); -+ if (JUMP_P(insn)) -+ jumps.push_back(insn); -+ -+ insn2index.insert (std::make_pair (insn, insns.size ())); -+ insns.push_back (insn); -+ } -+ } -+ -+ /* prepare insn_info */ -+ insn_info ii; -+ resetii (ii); -+ for (unsigned i = 0; i < insns.size (); ++i) -+ { -+ infos.push_back (ii); -+ } -+ -+ /* own analyze life */ -+ std::vector<std::pair<unsigned, insn_info>> todo; -+ todo.push_back (std::make_pair (insns.size () - 1, ii)); -+ -+ int pass = 0; -+ while (!todo.empty ()) -+ { -+ std::pair<unsigned, insn_info> p = *todo.rbegin (); -+ todo.pop_back (); -+ -+ insn_info ii = p.second; -+ -+ for (int pos = p.first; pos >= 0; --pos) -+ { -+ rtx_insn * insn = insns[pos]; -+ -+ if (pass && ii == infos[pos]) -+ break; -+ -+ ii |= infos[pos]; -+ -+ if (LABEL_P(insn)) -+ { -+ /* work on all jumps referring to that label. */ -+ for (std::vector<rtx_insn *>::iterator i = jumps.begin (); i != jumps.end (); ++i) -+ { -+ if (JUMP_LABEL(*i) == insn) -+ { -+ std::map<rtx_insn *, unsigned>::iterator j = insn2index.find (*i); -+ if (j != insn2index.end()) -+ todo.push_back (std::make_pair (j->second, ii)); -+ } -+ } -+ continue; -+ } -+ -+ rtx set = single_set (insn); -+ if (set == 0) -+ { -+ if (JUMP_P(insn)) { -+ resetii(ii); -+ setii(0, ii); -+ infos[pos] = ii; -+ continue; -+ } -+ fprintf(stderr, "##### "); -+ debug_rtx(insn); -+ continue; -+ } -+ -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); -+ -+ debug_rtx(insn); -+ -+ if (CALL_P(insn)) -+ { -+ /* a call sets d0 and kills d1,a0,a1. */ -+ if (getii (1, ii)) -+ fprintf (stderr, "d1 used after call\n"); -+ if (getii (8, ii)) -+ fprintf (stderr, "a0 used after call\n"); -+ if (getii (9, ii)) -+ fprintf (stderr, "a1 used after call\n"); -+ -+ resetii (ii); -+ // use regs depending on flag mregparm -+ for (int i = 0; i < amigaos_regparm; ++i) -+ { -+ setii (i, ii); -+ setii (i + 8, ii); -+ } -+ -+ // check for reg use -+ if (REG_P(src)) -+ setii (REGNO(src), ii); -+ -+ infos[pos] = ii; -+ continue; -+ } -+ -+ if (JUMP_P(insn)) -+ { -+ if (ANY_RETURN_P(src)) -+ { -+ resetii (ii); -+ setii (0, ii); -+ } -+ else -+ { -+ ii |= infos[pos]; -+ -+ // check for reg use -+ if (REG_P(src)) -+ setii (REGNO(src), ii); -+ -+ } -+ infos[pos] = ii; -+ continue; -+ } -+ -+ // scan insn for regs -+ // a def stop propagation -+ // a use starts propagation -+ // also add use to current ii -+ insn_info use; -+ resetii (use); -+ -+ insn_info def; -+ resetii (def); -+ -+ scanii (src, use); -+ if (REG_P(dst)) -+ setii (REGNO(dst), def); -+ else -+ scanii (dst, use); -+ -+ infos[pos] = use | ii; -+ -+ ii &= ~def; -+ ii |= use; -+ } -+ ++pass; -+ } -+ -+} - - /* - * #1 propagate a->b->a moves out of a loop. -@@ -102,29 +384,34 @@ dump_insns (char const * name); - move.b d1,(a0)+ - cmp.b #0, d1 - jne .L6 -+ - * -+ * Also allow exit jumps, if the modification of the reg is const -+ * and insert a correction after the exit label. -+ * The label must only be reachable by the exit jump. - */ --static int -+static unsigned - propagate_moves () - { -- int change_count = 0; -- rtx_insn *insn, *next; -+ unsigned change_count = 0; - rtx_insn * current_label = 0; -- std::vector<rtx_insn *> reg_reg; -+ unsigned current_label_index; -+ std::vector<unsigned> reg_reg; -+ std::vector<rtx_insn *> jump_out; - -- for (insn = get_insns (); insn; insn = next) -+ /* start at 1 since there must be an insn before the label. */ -+ for (unsigned index = 1; index < insns.size (); ++index) - { -- next = NEXT_INSN (insn); -- -- if (DEBUG_INSN_P(insn)) -- continue; -+ rtx_insn * insn = insns[index]; - - if (LABEL_P(insn)) - { - if (LABEL_NUSES(insn) == 1) - { - current_label = insn; -+ current_label_index = index; - reg_reg.clear (); -+ jump_out.clear (); - } - else - current_label = 0; -@@ -142,59 +429,180 @@ propagate_moves () - rtx src = SET_SRC(set); - rtx dst = SET_DEST(set); - if (REG_P(src) && REG_P(dst)) -- reg_reg.push_back (insn); -+ reg_reg.push_back (index); - } -+ else -+ current_label = 0; -+ - continue; - } - - if (JUMP_P(insn)) - { -- if (JUMP_LABEL (insn) == current_label && reg_reg.size () > 1) -+ rtx_insn * label = (rtx_insn *) JUMP_LABEL(insn); -+ if (label != current_label) -+ { -+ /* collect the labels for a later check if a fixup is possible. */ -+ if (LABEL_NUSES(label) == 1 && BARRIER_P(PREV_INSN (label))) -+ jump_out.push_back (label); -+ else -+ current_label = 0; -+ continue; -+ } -+ -+ if (reg_reg.size () > 1) - { - /* Search for reg/reg pairs. */ -- for (std::vector<rtx_insn *>::iterator i = reg_reg.begin (); -- i != reg_reg.end () && i + 1 != reg_reg.end ();) -+ for (std::vector<unsigned>::iterator i = reg_reg.begin (); i != reg_reg.end () && i + 1 != reg_reg.end (); -+ ) - { - bool inc = true; -- for (std::vector<rtx_insn *>::iterator j = i + 1; j != reg_reg.end ();) -+ for (std::vector<unsigned>::iterator j = i + 1; j != reg_reg.end ();) - { -- rtx seti = single_set (*i); -+ rtx_insn * ii = insns[*i]; -+ rtx seti = single_set (ii); - rtx srci = SET_SRC(seti); - rtx dsti = SET_DEST(seti); -- rtx setj = single_set (*j); -+ rtx_insn * jj = insns[*j]; -+ rtx setj = single_set (jj); - rtx srcj = SET_SRC(setj); - rtx dstj = SET_DEST(setj); - - if (rtx_equal_p (srci, dstj) && rtx_equal_p (srcj, dsti)) - { - /* Ensure correct usage. */ -- if (!reg_used_between_p (srci, current_label, *i) -- && !reg_used_between_p (srci, *i, *j) -- && !reg_used_between_p (srci, *j, insn) -- && !reg_used_between_p (dsti, current_label, *i) -- && !reg_used_between_p (dsti, *j, insn)) -+ if (!reg_used_between_p (srci, current_label, ii) && !reg_used_between_p (srci, ii, jj) -+ && !reg_used_between_p (srci, jj, insn) && !reg_used_between_p (dsti, current_label, ii) -+ && !reg_used_between_p (dsti, jj, insn)) - { -- fprintf (stderr, -- "condition met, moving regs %d, %d\n", -- REGNO(srci), REGNO(dsti)); -- -- /* Move out of loop. */ -- remove_insn (*i); -- if (PREV_INSN (current_label)) -- add_insn_after (*i, PREV_INSN (current_label), -- 0); -- else -- add_insn_before (*i, current_label, 0); -- -- remove_insn (*j); -- add_insn_after (*j, insn, 0); -- -- reg_reg.erase (j); -- reg_reg.erase (i); -- j = reg_reg.end (); -- inc = false; -- -- ++change_count; -+ std::vector<int> fixups; -+ -+ /* if there are jumps out of the loop, -+ * check if the modification occurs before the jump, -+ * and if, that it's a plus const. -+ */ -+ if (jump_out.size ()) -+ { -+ std::vector<rtx_insn *>::iterator label_iter = jump_out.begin (); -+ int fixup = 0; -+ fprintf (stderr, "need %d jump out fixups\n", jump_out.size ()); -+ -+ for (unsigned k = *i + 1; k != *j; ++k) -+ { -+ rtx_insn * check = insns[k]; -+ if (JUMP_P(check)) -+ { -+ fixups.push_back (fixup); -+ if (++label_iter == jump_out.end ()) -+ break; -+ continue; -+ } -+ -+ if (reg_overlap_mentioned_p (dsti, PATTERN (check))) -+ { -+ /* right now only support auto_incs. */ -+ rtx set = single_set (check); -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); -+ -+ if (reg_overlap_mentioned_p (dsti, dst)) -+ { -+ if (REG_P(dst)) -+ break; -+ if (!MEM_P(dst)) -+ break; -+ -+ rtx x = XEXP(dst, 0); -+ if (GET_CODE(x) == REG) -+ fixup += 0; // direct use -+ else if (GET_CODE(x) == PRE_INC || -+ GET_CODE(x) == POST_INC) -+ fixup -= GET_MODE_SIZE(GET_MODE(dst)); -+ else if (GET_CODE(dst) == PRE_DEC || -+ GET_CODE(dst) == POST_DEC) -+ fixup += GET_MODE_SIZE(GET_MODE(dst)); -+ else -+ break; -+ } -+ -+ if (reg_overlap_mentioned_p (dsti, src)) -+ { -+ if (REG_P(src)) -+ fixup += 0; -+ else -+ { -+ if (!MEM_P(src)) -+ break; -+ -+ rtx x = XEXP(src, 0); -+ if (GET_CODE(x) == REG) -+ fixup += 0; // direct use -+ else if (GET_CODE(x) == PRE_INC || -+ GET_CODE(x) == POST_INC) -+ fixup -= GET_MODE_SIZE(GET_MODE(dst)); -+ else if (GET_CODE(dst) == PRE_DEC || -+ GET_CODE(dst) == POST_DEC) -+ fixup += GET_MODE_SIZE(GET_MODE(dst)); -+ else -+ break; -+ } -+ } -+ } -+ } -+ } -+ -+ /* got a fixup for all jump_outs? */ -+ if (fixups.size () == jump_out.size ()) -+ { -+ rtx_insn * before = insns[current_label_index - 1]; -+ rtx_insn * after = insns[index + 1]; -+ rtx bset = single_set (before); -+ -+ fprintf (stderr, "condition met, moving regs %d, %d\n", REGNO(srci), REGNO(dsti)); -+ -+ /* Move in front of loop and mark as dead. */ -+ remove_insn (ii); -+ add_insn_after (ii, before, 0); -+ add_reg_note (ii, REG_DEAD, srci); -+ -+ /* Plus check if the reg was just loaded. */ -+ if (bset) -+ { -+ rtx bdst = SET_DEST(bset); -+ if (REG_P(bdst) && REGNO(bdst) == REGNO(srci)) -+ { -+ SET_DEST(bset) = dsti; -+ SET_INSN_DELETED(ii); -+ } -+ } -+ -+ /* Move behind loop - into next BB. */ -+ remove_insn (jj); -+ add_insn_before (jj, after, 0); -+ -+ reg_reg.erase (j); -+ reg_reg.erase (i); -+ j = reg_reg.end (); -+ inc = false; -+ -+ df_insn_rescan (ii); -+ df_insn_rescan (jj); -+ -+ /* add fixes if there were jumps out of the loop. */ -+ if (jump_out.size ()) -+ { -+ fprintf (stderr, "fixing %d jump outs\n", jump_out.size ()); -+ -+ for (unsigned k = 0; k < jump_out.size (); ++k) -+ { -+ rtx neu = gen_rtx_SET( -+ dstj, gen_rtx_PLUS(Pmode, dsti, gen_rtx_CONST_INT(Pmode, fixups[k]))); -+ rtx_insn * neui = emit_insn_after (neu, jump_out[k]); -+ df_insn_rescan (neui); -+ } -+ } -+ ++change_count; -+ } - } - } - if (inc) -@@ -222,19 +630,18 @@ propagate_moves () - * - * Use a simple state machine to find the patterns. - */ --static int -+static unsigned - opt_strcpy () - { -- int change_count = 0; -+ unsigned change_count = 0; - #if HAVE_cc0 -- rtx_insn *insn, *next; - rtx_insn * x2reg = 0; - rtx_insn * reg2x; - unsigned int regno; - -- for (insn = get_insns (); insn; insn = next) -+ for (unsigned index = 0; index < insns.size (); ++index) - { -- next = NEXT_INSN (insn); -+ rtx_insn * insn = insns[index]; - - if (!NONJUMP_INSN_P(insn)) - continue; -@@ -251,26 +658,22 @@ opt_strcpy () - rtx dst = XEXP(src, 0); - src = XEXP(src, 1); - -- if (CONST_INT_P(src) && INTVAL(src) == 0 -- && find_reg_note (insn, REG_DEAD, dst)) -+ if (CONST_INT_P(src) && INTVAL(src) == 0 && find_reg_note (insn, REG_DEAD, dst)) - { - /* now check via NOTICE_UPDATE_CC*/ -- NOTICE_UPDATE_CC (PATTERN (reg2x), reg2x); -- if (cc_status.flags == 0 -- && rtx_equal_p (dst, cc_status.value2)) -+ NOTICE_UPDATE_CC(PATTERN (reg2x), reg2x); -+ if (cc_status.flags == 0 && rtx_equal_p (dst, cc_status.value2)) - { - int num_clobbers_to_add = 0; - int insn_code_number; - - SET_SRC(single_set(reg2x)) = SET_SRC(single_set (x2reg)); -- insn_code_number = recog (PATTERN (reg2x), reg2x, -- &num_clobbers_to_add); -+ insn_code_number = recog (PATTERN (reg2x), reg2x, &num_clobbers_to_add); - - if (insn_code_number < 0) - { - /* restore register. */ -- SET_SRC(single_set(reg2x)) = SET_DEST( -- single_set (x2reg)); -+ SET_SRC(single_set(reg2x)) = SET_DEST(single_set (x2reg)); - } - else - { -@@ -278,17 +681,14 @@ opt_strcpy () - rtx link; - - fprintf ( -- stderr, -- "condition met, removing compare and joining insns - omit reg %d\n", -- REGNO(dst)); -+ stderr, -+ "condition met, removing compare and joining insns - omit reg %d\n", REGNO(dst)); - -- for (link = REG_NOTES(x2reg); link; -- link = XEXP(link, 1)) -+ for (link = REG_NOTES(x2reg); link; link = XEXP(link, 1)) - if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) - { - if (GET_CODE (link) == EXPR_LIST) -- add_reg_note (reg2x, REG_NOTE_KIND(link), -- copy_insn_1 (XEXP(link, 0))); -+ add_reg_note (reg2x, REG_NOTE_KIND(link), copy_insn_1 (XEXP(link, 0))); - else - add_shallow_copy_of_reg_note (reg2x, link); - } -@@ -338,45 +738,165 @@ opt_strcpy () - * Convert loops using a counting reg as offset with an address reg - * into a loop with auto inc address regs. - */ --static int -+static unsigned - offset_2_autoinc (void) - { -- rtx_insn *insn, *next; -+ unsigned change_count = 0; -+#if 0 - rtx_insn * reg_const = 0; -- int change_count = 0; - -- for (insn = get_insns (); insn; insn = next) -+ for (unsigned index = 0; index < insns.size (); ++index) - { -- next = NEXT_INSN (insn); -+ rtx_insn * insn = insns[index]; - - if (!next || !LABEL_P(next) || LABEL_NUSES(next) != 1) -- continue; -+ continue; - - if (!NONJUMP_INSN_P(insn)) -- continue; -+ continue; - - rtx set = single_set (insn); - if (!set) -- continue; -+ continue; - - rtx reg = SET_DEST(set); - if (!REG_P(reg)) -- continue; -+ continue; - - rtx val = SET_SRC(set); - -- - // fprintf(stderr, "possible start for offset_2_autoinc\n"); --// debug_rtx(insn); --// debug_rtx(next); -+// //debug_rtx(insn); -+// //debug_rtx(next); - - } - -+#endif - return change_count; - } - --/* Main entry point to the pass. */ -+/* -+ * convert -+ * -+ * set reg1, plus (reg2, const) -+ * set mem(reg2), y -+ * -+ * -> -+ * set reg1, reg2 -+ * set mem(reg1+), y -+ * -+ * if size of postinc == const -+ * -+ (insn 33 32 35 4 (set (reg/v/f:SI 8 a0 [orig:47 s ] [47]) -+ (plus:SI (reg/v/f:SI 9 a1 [orig:46 s ] [46]) -+ (const_int 1 [0x1]))) sn.c:5 141 {*addsi3_internal} -+ (nil)) -+ (insn 36 35 37 4 (set (mem:QI (reg/v/f:SI 9 a1 [orig:46 s ] [46]) [0 MEM[base: s_17, offset: 4294967295B]+0 S1 A8]) -+ (mem:QI (post_inc:SI (reg/v/f:SI 10 a2 [orig:53 s2 ] [53])) [0 MEM[base: s2_19, offset: 4294967295B]+0 S1 A8])) sn.c:5 46 {*m68k.md:1083} -+ (expr_list:REG_INC (reg/v/f:SI 10 a2 [orig:53 s2 ] [53]) -+ (nil))) -+ */ -+static unsigned -+commute_add_move (void) -+{ -+ unsigned change_count = 0; -+ -+ for (unsigned index = 0; index + 1 < insns.size (); ++index) -+ { -+ rtx_insn * insn = insns[index]; -+ rtx set = single_set (insn); -+ if (!set) -+ continue; -+ -+ rtx reg1 = SET_DEST(set); -+ if (!REG_P(reg1)) -+ continue; -+ -+ rtx plus = SET_SRC(set); -+ if (GET_CODE(plus) != PLUS) -+ continue; -+ -+ rtx reg2 = XEXP(plus, 0); -+ if (!REG_P(reg2)) -+ continue; -+ -+ rtx cnst = XEXP(plus, 1); -+ if (!CONST_INT_P(cnst)) -+ continue; -+ -+ rtx_insn * next = insns[index + 1]; -+ rtx set2 = single_set (next); -+ if (!set2) -+ continue; -+ -+ rtx dst = SET_DEST(set2); -+ if (!MEM_P(dst) || GET_MODE_SIZE(GET_MODE(dst)) != INTVAL(cnst)) -+ continue; -+ -+ rtx memreg = XEXP(dst, 0); -+ if (!REG_P(memreg) || REGNO(memreg) != REGNO(reg2)) -+ continue; - -+ int oldcost1 = insn_rtx_cost (set, true); -+ int oldcost2 = insn_rtx_cost (set2, true); -+ -+ fprintf (stderr, "commute_add_move found, oldcost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); -+ -+ //debug_rtx (insn); -+ //debug_rtx (next); -+ -+ rtx pinc = gen_rtx_POST_INC(GET_MODE(dst), reg1); -+ rtx newmem = replace_equiv_address_nv (dst, pinc); -+ -+ if (validate_change (next, &SET_DEST(set2), newmem, 0)) -+ { -+ SET_INSN_DELETED(insn); -+ -+ insn = emit_insn_before (gen_movsi (reg1, reg2), next); -+ -+ add_reg_note (next, REG_INC, reg1); -+ -+ int newcost1 = insn_rtx_cost (set, true); -+ int newcost2 = insn_rtx_cost (set2, true); -+ -+ fprintf (stderr, "commute_add_move found, newcost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); -+ -+ //debug_rtx (insn); -+ //debug_rtx (next); -+ -+ df_insn_rescan (insn); -+ df_insn_rescan (next); -+ -+ ++change_count; -+ } -+ } -+ return change_count; -+} -+ -+static unsigned -+const_cmp_to_sub (void) -+{ -+ unsigned change_count = 0; -+#if HAVE_cc0 -+ for (unsigned index = 0; index + 1 < insns.size (); ++index) -+ { -+ rtx_insn * insn = insns[index]; -+ rtx set = single_set (insn); -+ if (!set) -+ continue; -+ -+ rtx dst = SET_DEST(set); -+ if (dst != cc0_rtx) -+ continue; -+ -+ fprintf (stderr, "cc0:"); -+ debug_rtx (insn); -+ } -+#endif -+ return change_count; -+} -+ -+/* Main entry point to the pass. */ - static unsigned int - execute_bbb_optimizations (void) - { -@@ -385,58 +905,87 @@ execute_bbb_optimizations (void) - df_analyze (); - - // dump_insns ("bbb 0"); -+ filter_insns (); -+ -+ for (;;) -+ { -+ int done = 1; -+ if (propagate_moves ()) -+ done = 0, filter_insns (); -+ -+ if (offset_2_autoinc ()) -+ done = 0, filter_insns (); - -- propagate_moves (); -+ if (opt_strcpy ()) -+ done = 0, filter_insns (); - -- offset_2_autoinc (); -+ if (commute_add_move ()) -+ done = 0, filter_insns (); - -- opt_strcpy (); -+ if (const_cmp_to_sub ()) -+ done = 0, filter_insns (); - --// dump_insns ("bbb 1"); -+ if (done) -+ break; -+ } -+ -+ dump_insns ("bbb 1"); -+ clear (); -+ -+ dump_costs (); - - return 0; - } - - namespace -+{ -+ -+ const pass_data pass_data_bbb_optimizations = -+ { RTL_PASS, /* type */ -+ "bbb", /* name */ -+ OPTGROUP_NONE, /* optinfo_flags */ -+ TV_NONE, /* tv_id */ -+ 0, /* properties_required */ -+ 0, /* properties_provided */ -+ 0, /* properties_destroyed */ -+ 0, /* todo_flags_start */ -+ ( TODO_df_finish | TODO_df_verify), /* todo_flags_finish */ -+ }; -+ -+ class pass_bbb_optimizations : public rtl_opt_pass - { -+ public: -+ pass_bbb_optimizations (gcc::context *ctxt) : -+ rtl_opt_pass (pass_data_bbb_optimizations, ctxt) -+ { -+ } - -- const pass_data pass_data_bbb_optimizations = -- { -- RTL_PASS, /* type */ -- "bbb", /* name */ -- OPTGROUP_NONE, /* optinfo_flags */ -- TV_NONE, /* tv_id */ -- 0, /* properties_required */ -- 0, /* properties_provided */ -- 0, /* properties_destroyed */ -- 0, /* todo_flags_start */ -- ( TODO_df_finish | TODO_df_verify ), /* todo_flags_finish */ -- }; -- -- class pass_bbb_optimizations : public rtl_opt_pass -- { -- public: -- pass_bbb_optimizations (gcc::context *ctxt) -- : rtl_opt_pass (pass_data_bbb_optimizations, ctxt) -- {} -- -- /* opt_pass methods: */ -- virtual bool gate (function *) -- { -- return true; -- } -- -- virtual unsigned int execute (function *) -- { -- return execute_bbb_optimizations (); -- } -- -- }; // class pass_bbb_optimizations -- -- } // anon namespace -+ /* opt_pass methods: */ -+ virtual bool -+ gate (function *) -+ { -+ return TARGET_AMIGA; -+ } -+ -+ virtual unsigned int -+ execute (function *) -+ { -+ return execute_bbb_optimizations (); -+ } -+ -+ opt_pass * -+ clone () -+ { -+ return new pass_bbb_optimizations (m_ctxt); -+ } -+ -+ }; -+// class pass_bbb_optimizations -+ -+}// anon namespace - - rtl_opt_pass * --make_pass_bbb_optimizations (gcc::context *ctxt) -- { -- return new pass_bbb_optimizations (ctxt); -- } -+make_pass_bbb_optimizations (gcc::context * ctxt) -+{ -+ return new pass_bbb_optimizations (ctxt); -+} -diff --git a/gcc/passes.def b/gcc/passes.def -index 45ff86c383e4..ca5b94552d4e 100644 ---- gcc/passes.def -+++ gcc/passes.def -@@ -460,6 +460,7 @@ along with GCC; see the file COPYING3. If not see - NEXT_PASS (pass_stack_adjustments); - NEXT_PASS (pass_fast_rtl_dce); - NEXT_PASS (pass_reorder_blocks); -+ NEXT_PASS (pass_bbb_optimizations); - NEXT_PASS (pass_branch_target_load_optimize2); - NEXT_PASS (pass_leaf_regs); - NEXT_PASS (pass_split_before_sched2); - -From a56cbf57c5732afe7dfe0b67472284434ccfcbb2 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 22:54:53 +0200 -Subject: [PATCH 054/303] @B fix resident options, add -fbbb - ---- - gcc/config/m68k/amigaos.h | 2 +- - gcc/config/m68k/amigaos.opt | 10 +++++++--- - 2 files changed, 8 insertions(+), 4 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.h b/gcc/config/m68k/amigaos.h -index ce47723e962f..49dd90d745c3 100644 ---- gcc/config/m68k/amigaos.h -+++ gcc/config/m68k/amigaos.h -@@ -454,7 +454,7 @@ extern tree amigaos_handle_type_attribute(tree *, tree, tree, int, bool*); - #define SUBTARGET_OVERRIDE_OPTIONS \ - do \ - { \ -- if (!TARGET_68020 && flag_mybaserel==2) \ -+ if (!TARGET_68020 && flag_pic==4) \ - error ("-fbaserel32 is not supported on the 68000 or 68010\n"); \ - if (amigaos_regparm > 0 && amigaos_regparm > AMIGAOS_MAX_REGPARM) \ - error ("-mregparm=x with 1 <= x <= %d\n", AMIGAOS_MAX_REGPARM); \ -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index f985cf5e2845..2d8bed0a9103 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -32,13 +32,17 @@ Target Report Var(flag_pic,4) - data is adressed relativ to a4 with 32 bit offsets - - resident --Target Common Report Var(flag_mybaserel,1) -+Target Common Report Var(flag_pic,3) - data is adressed relativ to a4, linked as resident - - resident32 --Target Common Report Var(flag_mybaserel,2) -+Target Common Report Var(flag_pic,4) - data is adressed relativ to a4 with 32 bit offsets, linked as resident - - mcrt= - Target RejectNegative Var(amigaos_crt) Joined --Specify startup binary -\ No newline at end of file -+Specify startup binary -+ -+fbbb -+Target Var(flag_bbb_opts,1) UInteger Init(0) -+Enable Bebbo's optimizations - -From 01bd7d9ab157a9d973115a47cb9d24446f30f619 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 22:55:25 +0200 -Subject: [PATCH 055/303] @I cleanup - ---- - gcc/config/m68k/m68k.c | 10 ---------- - 1 file changed, 10 deletions(-) - -diff --git a/gcc/config/m68k/m68k.c b/gcc/config/m68k/m68k.c -index 6c0d9211598d..52eabeaafb23 100644 ---- gcc/config/m68k/m68k.c -+++ gcc/config/m68k/m68k.c -@@ -2928,16 +2928,6 @@ m68k_rtx_costs (rtx x, machine_mode mode, int outer_code, - *total = COSTS_N_INSNS (TARGET_COLDFIRE ? 2 : 3); - return true; - } -- /* reg + value */ --// if (mode == SImode --// && REG_P(XEXP(x, 0))) { --// if (m68k_rtx_costs(XEXP(x, 1), mode, PLUS, 1, total, speed)) --// { --// if (REGNO_REG_CLASS(REGNO(XEXP(x, 0))) == ADDR_REGS) --// *total += 4; --// return true; --// } --// } - - return false; - - -From ab8a4e993790f397307d8ec74581791e12470cf9 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Wed, 5 Apr 2017 23:00:59 +0200 -Subject: [PATCH 056/303] @B fix life analysis and commute_add_move, also some - cleanup - ---- - gcc/bbb-opts.c | 314 +++++++++++++++++++++++++++++++++------------------------ - 1 file changed, 180 insertions(+), 134 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index 7fd01139d0f3..48e2fa3fd255 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -1,5 +1,6 @@ - /* Bebbo's Optimizations. -- Copyright (C) 2010-2016 Free Software Foundation, Inc. -+ Copyright (C) 2010-2017 Free Software Foundation, Inc. -+ Copyright (C) 2017 Stefan "Bebbo" Franke. - - This file is part of GCC. - -@@ -26,14 +27,7 @@ - * check if a->b->a can be moved out of a loop. - * - * #2 strcpy_opt -- * move a,reg -- * move reg,b -- * cmp #0,reg -- * jcc -- * -- * -> -- * move a,b -- * jcc -+ * check if a temp reg can be eliminated. - * - */ - -@@ -55,39 +49,91 @@ - #include <map> - - /* enough for m68k. */ --typedef unsigned insn_info; //[(FIRST_PSEUDO_REGISTER + sizeof(unsigned) * 8 - 1) / (sizeof(unsigned) * 8)]; -- --static inline void --resetii (unsigned & ii) -+struct insn_info - { -- ii = 0; --} -+ unsigned mask; - --static inline void --setii (unsigned regno, unsigned & ii) --{ -- ii |= 1 << regno; --} -+ insn_info () : -+ mask (0) -+ { -+ } - --static inline void --clearii (unsigned regno, unsigned & ii) --{ -- ii &= ~(1 << regno); --} -+ inline void -+ reset () -+ { -+ mask = 0; -+ } - --static inline bool --getii (unsigned regno, unsigned & ii) --{ -- return ii & (1 << regno) ? true : false; --} -+ inline void -+ set (int regno) -+ { -+ mask |= 1 << regno; -+ } -+ -+ inline void -+ unset (int regno) -+ { -+ mask &= ~(1 << regno); -+ } -+ -+ inline bool -+ get (int regno) -+ { -+ return (mask & (1 << regno)) != 0; -+ } -+ -+ inline insn_info -+ operator | (insn_info const & o) const -+ { -+ insn_info t; -+ t.mask = mask | o.mask; -+ return t; -+ } -+ -+ inline insn_info -+ operator & (insn_info const & o) const -+ { -+ insn_info t; -+ t.mask = mask & o.mask; -+ return t; -+ } -+ -+ inline insn_info & -+ operator |= (insn_info const & o) -+ { -+ mask |= o.mask; -+ return *this; -+ } -+ -+ inline insn_info & -+ operator &= (insn_info const & o) -+ { -+ mask &= o.mask; -+ return *this; -+ } -+ -+ inline bool -+ operator == (insn_info const & o) -+ { -+ return mask == o.mask; -+ } -+ -+ inline insn_info -+ operator ~ () const -+ { -+ insn_info t; -+ t.mask = ~mask; -+ return t; -+ } -+}; - - /* scan rtx for registers. */ - static void --scanii (rtx x, unsigned & ii) -+scanii (rtx x, insn_info & ii) - { - if (REG_P(x)) - { -- setii (REGNO(x), ii); -+ ii.set (REGNO(x)); - return; - } - -@@ -117,61 +163,27 @@ clear (void) - infos.clear (); - } - --static void --dump_costs (void) --{ -- rtx d0 = gen_raw_REG (SImode, 0); -- rtx d0b = gen_raw_REG (QImode, 0); -- rtx d1 = gen_raw_REG (SImode, 1); -- rtx d1b = gen_raw_REG (QImode, 1); -- rtx a0 = gen_raw_REG (SImode, 8); -- rtx a1 = gen_raw_REG (SImode, 9); -- -- struct ICO -- { -- char const * name; -- rtx set; -- } data[] = -- { -- { "move d0,(a0)", gen_rtx_SET(gen_rtx_MEM (SImode, a0), d0) }, -- { "move a0,d0", gen_rtx_SET(d0, a0) }, -- { "move (a0),d0", gen_rtx_SET(d0, gen_rtx_MEM (SImode, a0)) }, -- { "move d0,(a0)", gen_rtx_SET(gen_rtx_MEM (SImode, a0), d0) }, -- { "move d1,(a1)+", gen_rtx_SET(d1, gen_rtx_MEM (SImode, gen_rtx_POST_INC (SImode, a1))) }, -- { "move (a0),(a1)", gen_rtx_SET(gen_rtx_MEM (SImode, a1), gen_rtx_MEM (SImode, a0)) }, -- { 0, 0 } }, *p; -- -- for (p = data; p->name; ++p) -- { -- int cost = insn_rtx_cost (p->set, true); -- fprintf (stderr, "%s: %d\n", p->name, cost); -- } --} -- -- - static void - dump_insns (char const * name) - { -- rtx_insn *insn, *next; -- fprintf(stderr, "====================================: %s\n", name); -- for (unsigned i = 0; i < insns.size(); ++i) -+ fprintf (stderr, "====================================: %s\n", name); -+ for (unsigned i = 0; i < insns.size (); ++i) - { - insn_info & ii = infos[i]; - - for (int j = 0; j < 8; ++j) -- if (getii(j, ii)) -- fprintf(stderr, "d%d ", j); -+ if (ii.get (j)) -+ fprintf (stderr, "d%d ", j); - - for (int j = 8; j < 16; ++j) -- if (getii(j, ii)) -- fprintf(stderr, "a%d ", j-8); -+ if (ii.get (j)) -+ fprintf (stderr, "a%d ", j - 8); - -- fprintf(stderr, "\t"); -- debug_rtx(insns[i]); -+ fprintf (stderr, "\t"); -+ debug_rtx (insns[i]); - } - } - -- - /* - * Create a filtered view of insns - keep only those to work with. - */ -@@ -192,7 +204,7 @@ filter_insns () - { - // debug_rtx (insn); - if (JUMP_P(insn)) -- jumps.push_back(insn); -+ jumps.push_back (insn); - - insn2index.insert (std::make_pair (insn, insns.size ())); - insns.push_back (insn); -@@ -201,13 +213,12 @@ filter_insns () - - /* prepare insn_info */ - insn_info ii; -- resetii (ii); - for (unsigned i = 0; i < insns.size (); ++i) - { - infos.push_back (ii); - } - -- /* own analyze life */ -+ /* own analyze reg life */ - std::vector<std::pair<unsigned, insn_info>> todo; - todo.push_back (std::make_pair (insns.size () - 1, ii)); - -@@ -236,53 +247,40 @@ filter_insns () - if (JUMP_LABEL(*i) == insn) - { - std::map<rtx_insn *, unsigned>::iterator j = insn2index.find (*i); -- if (j != insn2index.end()) -+ if (j != insn2index.end ()) - todo.push_back (std::make_pair (j->second, ii)); - } - } - continue; - } - -- rtx set = single_set (insn); -- if (set == 0) -- { -- if (JUMP_P(insn)) { -- resetii(ii); -- setii(0, ii); -- infos[pos] = ii; -- continue; -- } -- fprintf(stderr, "##### "); -- debug_rtx(insn); -- continue; -- } -- -- rtx src = SET_SRC(set); -- rtx dst = SET_DEST(set); -- -- debug_rtx(insn); -+ rtx pattern = PATTERN (insn); - - if (CALL_P(insn)) - { - /* a call sets d0 and kills d1,a0,a1. */ -- if (getii (1, ii)) -+ if (ii.get (1)) - fprintf (stderr, "d1 used after call\n"); -- if (getii (8, ii)) -+ if (ii.get (8)) - fprintf (stderr, "a0 used after call\n"); -- if (getii (9, ii)) -+ if (ii.get (9)) - fprintf (stderr, "a1 used after call\n"); - -- resetii (ii); -+ ii.unset(0); -+ ii.unset(1); -+ ii.unset(8); -+ ii.unset(9); -+ -+ // FIXME: get the DECL and read attributes. - // use regs depending on flag mregparm - for (int i = 0; i < amigaos_regparm; ++i) - { -- setii (i, ii); -- setii (i + 8, ii); -+ ii.set (i); -+ ii.set (i + 8); - } - - // check for reg use -- if (REG_P(src)) -- setii (REGNO(src), ii); -+ scanii (pattern, ii); - - infos[pos] = ii; - continue; -@@ -290,37 +288,55 @@ filter_insns () - - if (JUMP_P(insn)) - { -- if (ANY_RETURN_P(src)) -+ if (ANY_RETURN_P(pattern)) - { -- resetii (ii); -- setii (0, ii); -+ ii.reset (); -+ ii.set (0); - } - else - { - ii |= infos[pos]; - - // check for reg use -- if (REG_P(src)) -- setii (REGNO(src), ii); -+ scanii(PATTERN(insn), ii); -+ -+ } -+ infos[pos] = ii; -+ continue; -+ } -+ - -+ rtx set = single_set (insn); -+ if (set == 0) -+ { -+ if (GET_CODE (pattern) == USE) -+ { -+ rtx x = XEXP(pattern, 0); -+ if (REG_P(x)) -+ ii.set(REGNO(x)); -+ infos[pos] = ii; -+ continue; - } -+ -+ fprintf (stderr, "##### "); -+ debug_rtx (insn); -+ scanii (pattern, ii); - infos[pos] = ii; - continue; - } - -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); - // scan insn for regs - // a def stop propagation - // a use starts propagation - // also add use to current ii - insn_info use; -- resetii (use); -- - insn_info def; -- resetii (def); - - scanii (src, use); - if (REG_P(dst)) -- setii (REGNO(dst), def); -+ def.set (REGNO(dst)); - else - scanii (dst, use); - -@@ -808,16 +824,16 @@ commute_add_move (void) - if (!set) - continue; - -- rtx reg1 = SET_DEST(set); -- if (!REG_P(reg1)) -+ rtx reg1dst = SET_DEST(set); -+ if (!REG_P(reg1dst)) - continue; - - rtx plus = SET_SRC(set); - if (GET_CODE(plus) != PLUS) - continue; - -- rtx reg2 = XEXP(plus, 0); -- if (!REG_P(reg2)) -+ rtx reg1src = XEXP(plus, 0); -+ if (!REG_P(reg1src) || reg1src == reg1dst) - continue; - - rtx cnst = XEXP(plus, 1); -@@ -834,35 +850,35 @@ commute_add_move (void) - continue; - - rtx memreg = XEXP(dst, 0); -- if (!REG_P(memreg) || REGNO(memreg) != REGNO(reg2)) -+ if (!REG_P(memreg) || REGNO(memreg) != REGNO(reg1src)) - continue; - - int oldcost1 = insn_rtx_cost (set, true); - int oldcost2 = insn_rtx_cost (set2, true); - -- fprintf (stderr, "commute_add_move found, oldcost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); -+ fprintf (stderr, "commute_add_move found, old cost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); - -- //debug_rtx (insn); -- //debug_rtx (next); -+ debug_rtx (insn); -+ debug_rtx (next); - -- rtx pinc = gen_rtx_POST_INC(GET_MODE(dst), reg1); -+ rtx pinc = gen_rtx_POST_INC(GET_MODE(dst), reg1dst); - rtx newmem = replace_equiv_address_nv (dst, pinc); - - if (validate_change (next, &SET_DEST(set2), newmem, 0)) - { - SET_INSN_DELETED(insn); - -- insn = emit_insn_before (gen_movsi (reg1, reg2), next); -+ insn = emit_insn_before (gen_movsi (reg1dst, reg1src), next); - -- add_reg_note (next, REG_INC, reg1); -+ add_reg_note (next, REG_INC, reg1dst); - - int newcost1 = insn_rtx_cost (set, true); - int newcost2 = insn_rtx_cost (set2, true); - -- fprintf (stderr, "commute_add_move found, newcost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); -+ fprintf (stderr, "commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); - -- //debug_rtx (insn); -- //debug_rtx (next); -+ debug_rtx (insn); -+ debug_rtx (next); - - df_insn_rescan (insn); - df_insn_rescan (next); -@@ -889,13 +905,43 @@ const_cmp_to_sub (void) - if (dst != cc0_rtx) - continue; - -- fprintf (stderr, "cc0:"); -- debug_rtx (insn); -+// fprintf (stderr, "cc0:"); -+// debug_rtx (insn); - } - #endif - return change_count; - } - -+static unsigned -+elim_dead_assign (void) -+{ -+ unsigned change_count = 0; -+ for (unsigned index = 0; index + 1 < insns.size (); ++index) -+ { -+ rtx_insn * insn = insns[index]; -+ if (!NONJUMP_INSN_P(insn)) -+ continue; -+ -+ rtx set = single_set (insn); -+ if (!set) -+ continue; -+ -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); -+ if (!REG_P(dst) || !REG_P(src)) -+ continue; -+ -+ if (!infos[index].get (REGNO(dst))) -+ { -+ fprintf (stderr, "eliminate dead assignment to %d:", REGNO(dst)); -+ debug_rtx (insn); -+ SET_INSN_DELETED(insn); -+ ++change_count; -+ } -+ } -+ return change_count; -+} -+ - /* Main entry point to the pass. */ - static unsigned int - execute_bbb_optimizations (void) -@@ -904,7 +950,6 @@ execute_bbb_optimizations (void) - df_note_add_problem (); - df_analyze (); - --// dump_insns ("bbb 0"); - filter_insns (); - - for (;;) -@@ -925,15 +970,16 @@ execute_bbb_optimizations (void) - if (const_cmp_to_sub ()) - done = 0, filter_insns (); - -+ if (elim_dead_assign ()) -+ done = 0, filter_insns (); -+ - if (done) - break; - } - -- dump_insns ("bbb 1"); -+// dump_insns ("bbb 1"); - clear (); - -- dump_costs (); -- - return 0; - } - -@@ -964,7 +1010,7 @@ namespace - virtual bool - gate (function *) - { -- return TARGET_AMIGA; -+ return TARGET_AMIGA && flag_bbb_opts; - } - - virtual unsigned int - -From f5cd54a27e20a9ef7b1ec441fad9486216a87253 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 6 Apr 2017 13:41:46 +0200 -Subject: [PATCH 057/303] @N const_cmp_to_sub - ---- - gcc/bbb-opts.c | 187 ++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 146 insertions(+), 41 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index 48e2fa3fd255..44616bcabd6b 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -48,7 +48,9 @@ - #include <vector> - #include <map> - --/* enough for m68k. */ -+/* Enough for m68k. -+ * Why a class? Maybe extend it for general usage. -+ */ - struct insn_info - { - unsigned mask; -@@ -127,7 +129,7 @@ struct insn_info - } - }; - --/* scan rtx for registers. */ -+/* scan rtx for registers and set the corresponding flags. */ - static void - scanii (rtx x, insn_info & ii) - { -@@ -149,11 +151,17 @@ scanii (rtx x, insn_info & ii) - } - } - -+/* -+ * Collect some data. -+ */ - static std::vector<rtx_insn *> insns; - static std::vector<rtx_insn *> jumps; - static std::map<rtx_insn *, unsigned> insn2index; - static std::vector<insn_info> infos; - -+/* -+ * Reset collected data. -+ */ - static void - clear (void) - { -@@ -163,6 +171,10 @@ clear (void) - infos.clear (); - } - -+/* -+ * Helper function to dump the code. -+ * Sometimes used during debugging. -+ */ - static void - dump_insns (char const * name) - { -@@ -188,7 +200,7 @@ dump_insns (char const * name) - * Create a filtered view of insns - keep only those to work with. - */ - static void --filter_insns () -+update_meta_data () - { - rtx_insn *insn, *next; - clear (); -@@ -258,18 +270,11 @@ filter_insns () - - if (CALL_P(insn)) - { -- /* a call sets d0 and kills d1,a0,a1. */ -- if (ii.get (1)) -- fprintf (stderr, "d1 used after call\n"); -- if (ii.get (8)) -- fprintf (stderr, "a0 used after call\n"); -- if (ii.get (9)) -- fprintf (stderr, "a1 used after call\n"); -- -- ii.unset(0); -- ii.unset(1); -- ii.unset(8); -- ii.unset(9); -+ /* a call sets d0 and maybe also d1,a0,a1. */ -+ ii.unset (0); -+ ii.unset (1); -+ ii.unset (8); -+ ii.unset (9); - - // FIXME: get the DECL and read attributes. - // use regs depending on flag mregparm -@@ -298,14 +303,13 @@ filter_insns () - ii |= infos[pos]; - - // check for reg use -- scanii(PATTERN(insn), ii); -+ scanii (PATTERN (insn), ii); - - } - infos[pos] = ii; - continue; - } - -- - rtx set = single_set (insn); - if (set == 0) - { -@@ -313,13 +317,16 @@ filter_insns () - { - rtx x = XEXP(pattern, 0); - if (REG_P(x)) -- ii.set(REGNO(x)); -+ ii.set (REGNO(x)); - infos[pos] = ii; - continue; - } - -- fprintf (stderr, "##### "); -- debug_rtx (insn); -+ if (GET_CODE (pattern) != PARALLEL) -+ { -+ fprintf (stderr, "##### "); -+ debug_rtx (insn); -+ } - scanii (pattern, ii); - infos[pos] = ii; - continue; -@@ -501,7 +508,7 @@ propagate_moves () - { - std::vector<rtx_insn *>::iterator label_iter = jump_out.begin (); - int fixup = 0; -- fprintf (stderr, "need %d jump out fixups\n", jump_out.size ()); -+ fprintf (stderr, ": need %d jump out fixups\n", jump_out.size ()); - - for (unsigned k = *i + 1; k != *j; ++k) - { -@@ -574,7 +581,7 @@ propagate_moves () - rtx_insn * after = insns[index + 1]; - rtx bset = single_set (before); - -- fprintf (stderr, "condition met, moving regs %d, %d\n", REGNO(srci), REGNO(dsti)); -+ fprintf (stderr, ": condition met, moving regs %d, %d\n", REGNO(srci), REGNO(dsti)); - - /* Move in front of loop and mark as dead. */ - remove_insn (ii); -@@ -607,7 +614,7 @@ propagate_moves () - /* add fixes if there were jumps out of the loop. */ - if (jump_out.size ()) - { -- fprintf (stderr, "fixing %d jump outs\n", jump_out.size ()); -+ fprintf (stderr, ": fixing %d jump outs\n", jump_out.size ()); - - for (unsigned k = 0; k < jump_out.size (); ++k) - { -@@ -698,7 +705,7 @@ opt_strcpy () - - fprintf ( - stderr, -- "condition met, removing compare and joining insns - omit reg %d\n", REGNO(dst)); -+ ": condition met, removing compare and joining insns - omit reg %d\n", REGNO(dst)); - - for (link = REG_NOTES(x2reg); link; link = XEXP(link, 1)) - if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) -@@ -856,7 +863,7 @@ commute_add_move (void) - int oldcost1 = insn_rtx_cost (set, true); - int oldcost2 = insn_rtx_cost (set2, true); - -- fprintf (stderr, "commute_add_move found, old cost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); -+ fprintf (stderr, ": commute_add_move found, old cost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); - - debug_rtx (insn); - debug_rtx (next); -@@ -875,7 +882,7 @@ commute_add_move (void) - int newcost1 = insn_rtx_cost (set, true); - int newcost2 = insn_rtx_cost (set2, true); - -- fprintf (stderr, "commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); -+ fprintf (stderr, ": commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); - - debug_rtx (insn); - debug_rtx (next); -@@ -889,24 +896,122 @@ commute_add_move (void) - return change_count; - } - -+/* -+ * Replace -+ * -+ * move x,dx -+ * cmp dx,dy -+ * -+ * if dx and dy are both dead after compare. -+ * -+ * with -+ * -+ * sub #n,dx -+ * -+ d0 d1 d2 a0 a1 a7 (insn 99 59 41 7 (set (reg:SI 2 d2) -+ (const_int 1 [0x1])) sn.c:8 38 {*movsi_m68k} -+ (nil)) -+ d0 d1 d2 a0 a1 a7 (insn 41 99 42 7 (set (cc0) -+ (compare (reg/v:SI 1 d1 [orig:54 n ] [54]) -+ (reg:SI 2 d2))) sn.c:8 16 {*m68k.md:499} -+ (expr_list:REG_DEAD (reg:SI 2 d2) -+ (expr_list:REG_DEAD (reg/v:SI 1 d1 [orig:54 n ] [54]) -+ (nil)))) -+ * -+ */ - static unsigned - const_cmp_to_sub (void) - { - unsigned change_count = 0; - #if HAVE_cc0 -- for (unsigned index = 0; index + 1 < insns.size (); ++index) -+ for (unsigned index = 1; index + 1 < insns.size (); ++index) - { - rtx_insn * insn = insns[index]; -- rtx set = single_set (insn); -- if (!set) -+ rtx seti = single_set (insn); -+ if (!seti) - continue; - -- rtx dst = SET_DEST(set); -- if (dst != cc0_rtx) -+ rtx dsti = SET_DEST(seti); -+ if (dsti != cc0_rtx) -+ continue; -+ -+ rtx srci = SET_SRC(seti); -+ if (GET_CODE(srci) != COMPARE) -+ continue; -+ -+ rtx left = XEXP(srci, 0); -+ rtx right = XEXP(srci, 1); -+ if (!REG_P(left) || !REG_P(right)) - continue; - --// fprintf (stderr, "cc0:"); --// debug_rtx (insn); -+ if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) -+ continue; -+ -+ fprintf (stderr, ": found reg-reg compare with both dead\n"); -+ -+ // maybe add a search? -+ rtx_insn * prev = insns[index - 1]; -+ rtx setp = single_set (prev); -+ if (!setp) -+ continue; -+ -+ rtx dstp = SET_DEST(setp); -+ if (!REG_P(dstp) || dstp != left) -+ continue; -+ -+ rtx srcp = SET_SRC(setp); -+ if (!CONST_INT_P(srcp)) -+ continue; -+ -+ int intval = -INTVAL(srcp); -+ if (intval < -8 || intval > 7) -+ continue; -+ -+ enum machine_mode mode = GET_MODE(dstp); -+ rtx reg = dstp == left ? right : left; -+ rtx plus = gen_rtx_PLUS(mode, reg, gen_rtx_CONST_INT(mode, intval)); -+ -+ SET_SRC(setp) = plus; -+ SET_DEST(setp) = reg; -+ -+ int num_clobbers_to_add = 0; -+ int insn_code_number = recog (PATTERN (prev), prev, &num_clobbers_to_add); -+ -+ SET_SRC(setp) = srcp; -+ SET_DEST(setp) = dstp; -+ -+ if (insn_code_number < 0) -+ continue; -+ -+ debug_rtx(prev); -+ debug_rtx(insn); -+ -+ // also convert current statement to cmp #0, reg -+ SET_INSN_DELETED(insn); -+ rtx neu = gen_rtx_SET(cc0_rtx, gen_rtx_COMPARE(mode, reg, gen_rtx_CONST_INT(mode, 0))); -+ insn = emit_insn_after(neu, prev); -+ add_reg_note (insn, REG_DEAD, reg); -+ -+ SET_INSN_DELETED(prev); -+ neu = gen_rtx_SET(reg, plus); -+ prev = emit_insn_before(neu, insn); -+ -+ int omitted_regno = REGNO(dstp == left ? left: right); -+ if (!(df->hard_regs_live_count[omitted_regno] -= 2)) -+ df_set_regs_ever_live (omitted_regno, false); -+ -+ fprintf (stderr, ": replaced reg-reg compare with sub\n"); -+ debug_rtx(prev); -+ debug_rtx(insn); -+ -+ if (dstp != left) -+ { -+ // invert all conditions using this statement. -+ -+ } -+ -+ -+ ++change_count; - } - #endif - return change_count; -@@ -933,7 +1038,7 @@ elim_dead_assign (void) - - if (!infos[index].get (REGNO(dst))) - { -- fprintf (stderr, "eliminate dead assignment to %d:", REGNO(dst)); -+ fprintf (stderr, ": eliminate dead assignment to %d:", REGNO(dst)); - debug_rtx (insn); - SET_INSN_DELETED(insn); - ++change_count; -@@ -950,28 +1055,28 @@ execute_bbb_optimizations (void) - df_note_add_problem (); - df_analyze (); - -- filter_insns (); -+ update_meta_data (); - - for (;;) - { - int done = 1; - if (propagate_moves ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (offset_2_autoinc ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (opt_strcpy ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (commute_add_move ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (const_cmp_to_sub ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (elim_dead_assign ()) -- done = 0, filter_insns (); -+ done = 0, update_meta_data (); - - if (done) - break; - -From 485cc891b48af316e84f77e6142a0c28b80c596d Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Thu, 6 Apr 2017 22:05:20 +0200 -Subject: [PATCH 058/303] @N const_cmp_to_sub seems working - ---- - gcc/bbb-opts.c | 249 ++++++++++++++++++++++++++++++++++++++++++++------------- - 1 file changed, 192 insertions(+), 57 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index 44616bcabd6b..8a98fbfaad7c 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -50,45 +50,64 @@ - - /* Enough for m68k. - * Why a class? Maybe extend it for general usage. -+ * -+ * Track use & def separate to determine starting points. - */ - struct insn_info - { -- unsigned mask; -+ unsigned _use; -+ unsigned _def; - - insn_info () : -- mask (0) -+ _use (0), _def (0) - { - } - - inline void - reset () - { -- mask = 0; -+ _use = 0; -+ _def = 0; - } - - inline void -- set (int regno) -+ use (int regno) - { -- mask |= 1 << regno; -+ _use |= 1 << regno; -+ } -+ -+ inline void -+ def (int regno) -+ { -+ _use |= 1 << regno; -+ _def |= 1 << regno; - } - - inline void - unset (int regno) - { -- mask &= ~(1 << regno); -+ _use &= ~(1 << regno); -+ _def &= ~(1 << regno); - } - - inline bool -- get (int regno) -+ is_use (int regno) - { -- return (mask & (1 << regno)) != 0; -+ return (_use & (1 << regno)) != 0; -+ } -+ -+ inline bool -+ is_def (int regno) -+ { -+ return (_def & (1 << regno)) != 0; - } - - inline insn_info - operator | (insn_info const & o) const - { - insn_info t; -- t.mask = mask | o.mask; -+ t._use = _use | o._use; -+ t._def = _def | o._def; - return t; - } - -@@ -96,46 +115,67 @@ struct insn_info - operator & (insn_info const & o) const - { - insn_info t; -- t.mask = mask & o.mask; -+ t._use = _use & o._use; -+ t._def = _def & o._def; - return t; - } - - inline insn_info & - operator |= (insn_info const & o) - { -- mask |= o.mask; -+ _use |= o._use; -+ _def |= o._def; - return *this; - } - - inline insn_info & - operator &= (insn_info const & o) - { -- mask &= o.mask; -+ _use &= o._use; -+ _def &= o._def; - return *this; - } - - inline bool - operator == (insn_info const & o) - { -- return mask == o.mask; -+ return _use == o._use; - } - - inline insn_info - operator ~ () const - { - insn_info t; -- t.mask = ~mask; -+ t._use = ~_use; -+ t._def = ~_def; - return t; - } -+ -+ inline bool contains(insn_info const & o) const { -+ if (o._def & ~_def) -+ return false; -+ if (o._use & ~_use) -+ return false; -+ return true; -+ } -+ -+ void -+ scan (rtx); - }; - - /* scan rtx for registers and set the corresponding flags. */ --static void --scanii (rtx x, insn_info & ii) -+void -+insn_info::scan (rtx x) - { - if (REG_P(x)) - { -- ii.set (REGNO(x)); -+ use (REGNO(x)); -+ return; -+ } -+ -+ if (x == cc0_rtx) -+ { -+ use (FIRST_PSEUDO_REGISTER); - return; - } - -@@ -144,10 +184,10 @@ scanii (rtx x, insn_info & ii) - for (int i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) - { - if (fmt[i] == 'e') -- scanii (XEXP(x, i), ii); -+ scan (XEXP(x, i)); - else if (fmt[i] == 'E') - for (int j = XVECLEN (x, i) - 1; j >= 0; j--) -- scanii (XVECEXP(x, i, j), ii); -+ scan (XVECEXP(x, i, j)); - } - } - -@@ -171,6 +211,23 @@ clear (void) - infos.clear (); - } - -+static bool is_reg_dead(unsigned regno, unsigned pos) -+{ -+ if (pos >= infos.size()) -+ return true; -+ -+ insn_info & ii0 = infos[pos++]; -+ if (!ii0.is_use(regno)) -+ return true; -+ -+ if (pos >= infos.size()) -+ return true; -+ -+ insn_info & ii1 = infos[pos]; -+ -+ return !ii1.is_use(regno); -+} -+ - /* - * Helper function to dump the code. - * Sometimes used during debugging. -@@ -184,12 +241,15 @@ dump_insns (char const * name) - insn_info & ii = infos[i]; - - for (int j = 0; j < 8; ++j) -- if (ii.get (j)) -- fprintf (stderr, "d%d ", j); -+ if (ii.is_use (j)) -+ fprintf (stderr, ii.is_def (j) ? "*d%d " : "d%d ", j); - - for (int j = 8; j < 16; ++j) -- if (ii.get (j)) -- fprintf (stderr, "a%d ", j - 8); -+ if (ii.is_use (j)) -+ fprintf (stderr, ii.is_def (j) ? "*a%d " : "a%d ", j - 8); -+ -+ if (ii.is_use (FIRST_PSEUDO_REGISTER)) -+ fprintf (stderr, ii.is_def (FIRST_PSEUDO_REGISTER) ? "*cc " : "cc "); - - fprintf (stderr, "\t"); - debug_rtx (insns[i]); -@@ -246,7 +306,7 @@ update_meta_data () - { - rtx_insn * insn = insns[pos]; - -- if (pass && ii == infos[pos]) -+ if (pass && infos[pos].contains(ii)) - break; - - ii |= infos[pos]; -@@ -276,16 +336,16 @@ update_meta_data () - ii.unset (8); - ii.unset (9); - -- // FIXME: get the DECL and read attributes. -+ // FIXME: isuse the DECL and read attributes. - // use regs depending on flag mregparm - for (int i = 0; i < amigaos_regparm; ++i) - { -- ii.set (i); -- ii.set (i + 8); -+ ii.use (i); -+ ii.use (i + 8); - } - - // check for reg use -- scanii (pattern, ii); -+ ii.scan (pattern); - - infos[pos] = ii; - continue; -@@ -296,14 +356,14 @@ update_meta_data () - if (ANY_RETURN_P(pattern)) - { - ii.reset (); -- ii.set (0); -+ ii.use (0); - } - else - { - ii |= infos[pos]; - - // check for reg use -- scanii (PATTERN (insn), ii); -+ ii.scan (PATTERN (insn)); - - } - infos[pos] = ii; -@@ -317,7 +377,7 @@ update_meta_data () - { - rtx x = XEXP(pattern, 0); - if (REG_P(x)) -- ii.set (REGNO(x)); -+ ii.use (REGNO(x)); - infos[pos] = ii; - continue; - } -@@ -327,7 +387,7 @@ update_meta_data () - fprintf (stderr, "##### "); - debug_rtx (insn); - } -- scanii (pattern, ii); -+ ii.scan (pattern); - infos[pos] = ii; - continue; - } -@@ -341,13 +401,23 @@ update_meta_data () - insn_info use; - insn_info def; - -- scanii (src, use); -+ use.scan (src); - if (REG_P(dst)) -- def.set (REGNO(dst)); -+ def.def (REGNO(dst)); -+ else if (dst == cc0_rtx) -+ def.def (FIRST_PSEUDO_REGISTER); - else -- scanii (dst, use); -+ use.scan (dst); - -- infos[pos] = use | ii; -+ if (dst != cc0_rtx) -+ { -+ CC_STATUS_INIT; -+ NOTICE_UPDATE_CC(PATTERN (insn), insn); -+ if (cc_status.value1 || cc_status.value2) -+ def.def (FIRST_PSEUDO_REGISTER); -+ } -+ -+ infos[pos] = def | use | ii; - - ii &= ~def; - ii |= use; -@@ -778,15 +848,15 @@ offset_2_autoinc (void) - if (!NONJUMP_INSN_P(insn)) - continue; - -- rtx set = single_set (insn); -- if (!set) -+ rtx use = single_set (insn); -+ if (!use) - continue; - -- rtx reg = SET_DEST(set); -+ rtx reg = SET_DEST(use); - if (!REG_P(reg)) - continue; - -- rtx val = SET_SRC(set); -+ rtx val = SET_SRC(use); - - // fprintf(stderr, "possible start for offset_2_autoinc\n"); - // //debug_rtx(insn); -@@ -882,7 +952,8 @@ commute_add_move (void) - int newcost1 = insn_rtx_cost (set, true); - int newcost2 = insn_rtx_cost (set2, true); - -- fprintf (stderr, ": commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, newcost2); -+ fprintf (stderr, ": commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, -+ newcost2); - - debug_rtx (insn); - debug_rtx (next); -@@ -944,10 +1015,14 @@ const_cmp_to_sub (void) - if (!REG_P(left) || !REG_P(right)) - continue; - -- if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) -- continue; -+// if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) -+// continue; - -- fprintf (stderr, ": found reg-reg compare with both dead\n"); -+ if (!is_reg_dead(REGNO(left), index) || !is_reg_dead(REGNO(right), index)) -+ continue; -+ -+ fprintf (stderr, ": found reg-reg compare with both dead: %d %d\n", -+ is_reg_dead(REGNO(left), index), is_reg_dead(REGNO(right), index)); - - // maybe add a search? - rtx_insn * prev = insns[index - 1]; -@@ -956,7 +1031,7 @@ const_cmp_to_sub (void) - continue; - - rtx dstp = SET_DEST(setp); -- if (!REG_P(dstp) || dstp != left) -+ if (!REG_P(dstp)) - continue; - - rtx srcp = SET_SRC(setp); -@@ -969,7 +1044,7 @@ const_cmp_to_sub (void) - - enum machine_mode mode = GET_MODE(dstp); - rtx reg = dstp == left ? right : left; -- rtx plus = gen_rtx_PLUS(mode, reg, gen_rtx_CONST_INT(mode, intval)); -+ rtx plus = gen_rtx_PLUS(mode, reg, gen_rtx_CONST_INT (mode, intval)); - - SET_SRC(setp) = plus; - SET_DEST(setp) = reg; -@@ -983,33 +1058,93 @@ const_cmp_to_sub (void) - if (insn_code_number < 0) - continue; - -- debug_rtx(prev); -- debug_rtx(insn); -+ debug_rtx (prev); -+ debug_rtx (insn); - - // also convert current statement to cmp #0, reg - SET_INSN_DELETED(insn); - rtx neu = gen_rtx_SET(cc0_rtx, gen_rtx_COMPARE(mode, reg, gen_rtx_CONST_INT(mode, 0))); -- insn = emit_insn_after(neu, prev); -+ insn = emit_insn_after (neu, prev); - add_reg_note (insn, REG_DEAD, reg); - - SET_INSN_DELETED(prev); - neu = gen_rtx_SET(reg, plus); -- prev = emit_insn_before(neu, insn); -+ prev = emit_insn_before (neu, insn); - -- int omitted_regno = REGNO(dstp == left ? left: right); -- if (!(df->hard_regs_live_count[omitted_regno] -= 2)) -- df_set_regs_ever_live (omitted_regno, false); -+// urks - unknown side effects -+// int omitted_regno = REGNO(dstp); -+// if (!(df->hard_regs_live_count[omitted_regno] -= 2)) -+// df_set_regs_ever_live (omitted_regno, false); - - fprintf (stderr, ": replaced reg-reg compare with sub\n"); -- debug_rtx(prev); -- debug_rtx(insn); -+ debug_rtx (prev); -+ debug_rtx (insn); - - if (dstp != left) - { - // invert all conditions using this statement. -+ std::vector<unsigned> todo; -+ std::vector<unsigned> done; -+ done.resize(insns.size()); -+ todo.push_back (index + 1); - -- } -+ while (todo.size ()) -+ { -+ unsigned pos = todo[todo.size () - 1]; -+ todo.pop_back (); -+ -+ if (done[pos]) -+ continue; - -+ done[pos] = 1; -+ -+ if (infos[pos].is_def (FIRST_PSEUDO_REGISTER)) -+ continue; -+ -+ if (pos + 1 < infos.size ()) -+ todo.push_back (pos + 1); -+ -+ rtx_insn * patchme = insns[pos]; -+ if (!JUMP_P(insn)) -+ continue; -+ -+ std::map<rtx_insn *, unsigned>::iterator j = insn2index.find ((rtx_insn *) JUMP_LABEL(patchme)); -+ if (j != insn2index.end ()) -+ todo.push_back (j->second); -+ -+ rtx jmppattern = PATTERN (patchme); -+ -+ rtx jmpsrc = XEXP(jmppattern, 1); -+ if (GET_CODE(jmpsrc) == IF_THEN_ELSE) -+ { -+ rtx condition = XEXP(jmpsrc, 0); -+ RTX_CODE code = GET_CODE(condition); -+ RTX_CODE newcode = code; -+ if (code == GE) -+ newcode = LE; -+ else if (code == GT) -+ newcode = LT; -+ else if (code == LT) -+ newcode = GT; -+ else if (code == LE) -+ newcode = GE; -+ else if (code == GEU) -+ newcode = LEU; -+ else if (code == GTU) -+ newcode = LTU; -+ else if (code == LTU) -+ newcode = GTU; -+ else if (code == LEU) -+ newcode = GEU; -+ -+ if (code != newcode) -+ { -+ fprintf (stderr, ": patch jcc %d -> %d\n", code, newcode); -+ XEXP(jmpsrc, 0) = gen_rtx_fmt_ee(newcode, VOIDmode, XEXP(condition, 0), XEXP(condition, 1)); -+ } -+ } -+ } -+ } - - ++change_count; - } -@@ -1036,7 +1171,7 @@ elim_dead_assign (void) - if (!REG_P(dst) || !REG_P(src)) - continue; - -- if (!infos[index].get (REGNO(dst))) -+ if (!infos[index].is_use (REGNO(dst))) - { - fprintf (stderr, ": eliminate dead assignment to %d:", REGNO(dst)); - debug_rtx (insn); - -From 9967eed30e2e8f28bb48aa5a39d1cd578d4e0a7a Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 7 Apr 2017 04:03:53 +0200 -Subject: [PATCH 059/303] @B avoid illegal insns - ---- - gcc/bbb-opts.c | 188 ++++++++++++++++++++++++++++++++++++++++----------------- - 1 file changed, 132 insertions(+), 56 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index 8a98fbfaad7c..d9e77c53856d 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -79,7 +79,6 @@ struct insn_info - inline void - def (int regno) - { -- _use |= 1 << regno; - _def |= 1 << regno; - } - -@@ -151,7 +150,9 @@ struct insn_info - return t; - } - -- inline bool contains(insn_info const & o) const { -+ inline bool -+ contains (insn_info const & o) const -+ { - if (o._def & ~_def) - return false; - if (o._use & ~_use) -@@ -211,21 +212,22 @@ clear (void) - infos.clear (); - } - --static bool is_reg_dead(unsigned regno, unsigned pos) -+static bool -+is_reg_dead (unsigned regno, unsigned pos) - { -- if (pos >= infos.size()) -+ if (pos >= infos.size ()) - return true; - - insn_info & ii0 = infos[pos++]; -- if (!ii0.is_use(regno)) -+ if (!ii0.is_use (regno)) - return true; - -- if (pos >= infos.size()) -+ if (pos >= infos.size ()) - return true; - - insn_info & ii1 = infos[pos]; - -- return !ii1.is_use(regno); -+ return !ii1.is_use (regno); - } - - /* -@@ -274,7 +276,6 @@ update_meta_data () - - if (NONJUMP_INSN_P (insn) || LABEL_P(insn) || JUMP_P(insn) || CALL_P(insn)) - { -- // debug_rtx (insn); - if (JUMP_P(insn)) - jumps.push_back (insn); - -@@ -306,7 +307,7 @@ update_meta_data () - { - rtx_insn * insn = insns[pos]; - -- if (pass && infos[pos].contains(ii)) -+ if (pass && infos[pos].contains (ii)) - break; - - ii |= infos[pos]; -@@ -578,7 +579,6 @@ propagate_moves () - { - std::vector<rtx_insn *>::iterator label_iter = jump_out.begin (); - int fixup = 0; -- fprintf (stderr, ": need %d jump out fixups\n", jump_out.size ()); - - for (unsigned k = *i + 1; k != *j; ++k) - { -@@ -651,7 +651,8 @@ propagate_moves () - rtx_insn * after = insns[index + 1]; - rtx bset = single_set (before); - -- fprintf (stderr, ": condition met, moving regs %d, %d\n", REGNO(srci), REGNO(dsti)); -+ fprintf (stderr, ":bbb: propagate_moves condition met, moving regs %d, %d\n", -+ REGNO(srci), REGNO(dsti)); - - /* Move in front of loop and mark as dead. */ - remove_insn (ii); -@@ -684,7 +685,7 @@ propagate_moves () - /* add fixes if there were jumps out of the loop. */ - if (jump_out.size ()) - { -- fprintf (stderr, ": fixing %d jump outs\n", jump_out.size ()); -+ fprintf (stderr, ":bbb: propagate_moves fixing %d jump outs\n", jump_out.size ()); - - for (unsigned k = 0; k < jump_out.size (); ++k) - { -@@ -763,7 +764,7 @@ opt_strcpy () - SET_SRC(single_set(reg2x)) = SET_SRC(single_set (x2reg)); - insn_code_number = recog (PATTERN (reg2x), reg2x, &num_clobbers_to_add); - -- if (insn_code_number < 0) -+ if (insn_code_number < 0 || !check_asm_operands (reg2x)) - { - /* restore register. */ - SET_SRC(single_set(reg2x)) = SET_DEST(single_set (x2reg)); -@@ -775,7 +776,8 @@ opt_strcpy () - - fprintf ( - stderr, -- ": condition met, removing compare and joining insns - omit reg %d\n", REGNO(dst)); -+ ":bbb: opt_strcpy condition met, removing compare and joining insns - omit reg %d\n", -+ REGNO(dst)); - - for (link = REG_NOTES(x2reg); link; link = XEXP(link, 1)) - if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) -@@ -930,14 +932,6 @@ commute_add_move (void) - if (!REG_P(memreg) || REGNO(memreg) != REGNO(reg1src)) - continue; - -- int oldcost1 = insn_rtx_cost (set, true); -- int oldcost2 = insn_rtx_cost (set2, true); -- -- fprintf (stderr, ": commute_add_move found, old cost: %d = %d + %d\n", oldcost1 + oldcost2, oldcost1, oldcost2); -- -- debug_rtx (insn); -- debug_rtx (next); -- - rtx pinc = gen_rtx_POST_INC(GET_MODE(dst), reg1dst); - rtx newmem = replace_equiv_address_nv (dst, pinc); - -@@ -949,14 +943,7 @@ commute_add_move (void) - - add_reg_note (next, REG_INC, reg1dst); - -- int newcost1 = insn_rtx_cost (set, true); -- int newcost2 = insn_rtx_cost (set2, true); -- -- fprintf (stderr, ": commute_add_move found, new cost: %d = %d + %d\n", newcost1 + newcost2, newcost1, -- newcost2); -- -- debug_rtx (insn); -- debug_rtx (next); -+ fprintf (stderr, ":bbb: commute_add_move found\n"); - - df_insn_rescan (insn); - df_insn_rescan (next); -@@ -1018,11 +1005,15 @@ const_cmp_to_sub (void) - // if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) - // continue; - -- if (!is_reg_dead(REGNO(left), index) || !is_reg_dead(REGNO(right), index)) -- continue; -+ // TODO -+ // FEATURE: check if the next uses are also a add/sub -+ // then maybe that add/sub can be adjusted too - -- fprintf (stderr, ": found reg-reg compare with both dead: %d %d\n", -- is_reg_dead(REGNO(left), index), is_reg_dead(REGNO(right), index)); -+ if (!is_reg_dead (REGNO(left), index) || !is_reg_dead (REGNO(right), index)) -+ continue; -+ -+ fprintf (stderr, ":bbb: found reg-reg compare with both dead: %d %d\n", is_reg_dead (REGNO(left), index), -+ is_reg_dead (REGNO(right), index)); - - // maybe add a search? - rtx_insn * prev = insns[index - 1]; -@@ -1051,6 +1042,8 @@ const_cmp_to_sub (void) - - int num_clobbers_to_add = 0; - int insn_code_number = recog (PATTERN (prev), prev, &num_clobbers_to_add); -+ if (insn_code_number >= 0 && !check_asm_operands (prev)) -+ insn_code_number = -1; - - SET_SRC(setp) = srcp; - SET_DEST(setp) = dstp; -@@ -1058,9 +1051,6 @@ const_cmp_to_sub (void) - if (insn_code_number < 0) - continue; - -- debug_rtx (prev); -- debug_rtx (insn); -- - // also convert current statement to cmp #0, reg - SET_INSN_DELETED(insn); - rtx neu = gen_rtx_SET(cc0_rtx, gen_rtx_COMPARE(mode, reg, gen_rtx_CONST_INT(mode, 0))); -@@ -1076,16 +1066,14 @@ const_cmp_to_sub (void) - // if (!(df->hard_regs_live_count[omitted_regno] -= 2)) - // df_set_regs_ever_live (omitted_regno, false); - -- fprintf (stderr, ": replaced reg-reg compare with sub\n"); -- debug_rtx (prev); -- debug_rtx (insn); -+ fprintf (stderr, ":bbb: const_cmp_to_sub replaced reg-reg compare with sub\n"); - - if (dstp != left) - { - // invert all conditions using this statement. - std::vector<unsigned> todo; - std::vector<unsigned> done; -- done.resize(insns.size()); -+ done.resize (insns.size ()); - todo.push_back (index + 1); - - while (todo.size ()) -@@ -1139,7 +1127,7 @@ const_cmp_to_sub (void) - - if (code != newcode) - { -- fprintf (stderr, ": patch jcc %d -> %d\n", code, newcode); -+ fprintf (stderr, ":bbb: patch jcc %d -> %d\n", code, newcode); - XEXP(jmpsrc, 0) = gen_rtx_fmt_ee(newcode, VOIDmode, XEXP(condition, 0), XEXP(condition, 1)); - } - } -@@ -1173,8 +1161,7 @@ elim_dead_assign (void) - - if (!infos[index].is_use (REGNO(dst))) - { -- fprintf (stderr, ": eliminate dead assignment to %d:", REGNO(dst)); -- debug_rtx (insn); -+ fprintf (stderr, ":bbb: elim_dead_assign to %d\n", REGNO(dst)); - SET_INSN_DELETED(insn); - ++change_count; - } -@@ -1182,6 +1169,86 @@ elim_dead_assign (void) - return change_count; - } - -+/* -+ * rare and only little gain - but :-) -+ lea (-1,a0),a1 -+ add.l d1,a1 -+ subq.l #1,d1 -+ -> -+ move.l a0,a1 -+ subq.l #1,d1 -+ add.l d1,a1 -+ */ -+static unsigned -+merge_add (void) -+{ -+ unsigned change_count = 0; -+ for (unsigned index = 0; index + 2 < insns.size (); ++index) -+ { -+ rtx_insn * ins1 = insns[index]; -+ rtx_insn * ins2 = insns[index + 1]; -+ rtx_insn * ins3 = insns[index + 2]; -+ if (!NONJUMP_INSN_P(ins1) && !NONJUMP_INSN_P(ins2) && !NONJUMP_INSN_P(ins3)) -+ continue; -+ -+ rtx set1 = single_set (ins1); -+ rtx set2 = single_set (ins2); -+ rtx set3 = single_set (ins3); -+ if (!set1 || !set2 || !set3) -+ continue; -+ -+ rtx dst1 = SET_DEST(set1); -+ rtx dst2 = SET_DEST(set2); -+ rtx dst3 = SET_DEST(set3); -+ if (!REG_P(dst1) || !REG_P(dst2) || !REG_P(dst3)) -+ continue; -+ -+ CC_STATUS_INIT; -+ NOTICE_UPDATE_CC(PATTERN (ins2), ins2); -+ if (cc_status.value1 || cc_status.value2) -+ continue; -+ -+ rtx src1 = SET_SRC(set1); -+ rtx src2 = SET_SRC(set2); -+ rtx src3 = SET_SRC(set3); -+ if (GET_CODE(src1) != PLUS || GET_CODE(src2) != PLUS || GET_CODE(src3) != PLUS) -+ continue; -+ -+ rtx l1 = XEXP(src1, 0); -+ rtx l2 = XEXP(src2, 0); -+ rtx l3 = XEXP(src3, 0); -+ -+ rtx r1 = XEXP(src1, 1); -+ rtx r2 = XEXP(src2, 1); -+ rtx r3 = XEXP(src3, 1); -+ if (!CONST_INT_P(r1) || !REG_P(r2) || !CONST_INT_P(r3)) -+ continue; -+ -+ if (REGNO(dst1) != REGNO(dst2) || REGNO(r2) != REGNO(dst3)) -+ continue; -+ -+ fprintf (stderr, ": merge_add pattern found\n"); -+ -+ SET_SRC(set1) = l1; -+ remove_insn (ins2); -+ add_insn_after (ins2, ins3, 0); -+ } -+ return change_count; -+} -+ -+/* -+ * Always prefer lower register numbers within the class. -+ */ -+static unsigned -+bb_reg_rename(void) -+{ -+ unsigned change_count = 0; -+ for (unsigned index = 0; index < insns.size (); ++index) -+ { -+ } -+ return change_count; -+} -+ - /* Main entry point to the pass. */ - static unsigned int - execute_bbb_optimizations (void) -@@ -1195,22 +1262,31 @@ execute_bbb_optimizations (void) - for (;;) - { - int done = 1; -- if (propagate_moves ()) -- done = 0, update_meta_data (); -+ for (;;) -+ { -+ if (propagate_moves ()) -+ done = 0, update_meta_data (); - -- if (offset_2_autoinc ()) -- done = 0, update_meta_data (); -+ if (offset_2_autoinc ()) -+ done = 0, update_meta_data (); - -- if (opt_strcpy ()) -- done = 0, update_meta_data (); -+ if (opt_strcpy ()) -+ done = 0, update_meta_data (); - -- if (commute_add_move ()) -- done = 0, update_meta_data (); -+ if (commute_add_move ()) -+ done = 0, update_meta_data (); - -- if (const_cmp_to_sub ()) -- done = 0, update_meta_data (); -+ if (const_cmp_to_sub ()) -+ done = 0, update_meta_data (); -+ -+ if (merge_add ()) -+ done = 0, update_meta_data (); -+ -+ if (elim_dead_assign ()) -+ done = 0, update_meta_data (); -+ } - -- if (elim_dead_assign ()) -+ if (bb_reg_rename ()) - done = 0, update_meta_data (); - - if (done) -@@ -1250,7 +1326,7 @@ namespace - virtual bool - gate (function *) - { -- return TARGET_AMIGA && flag_bbb_opts; -+ return TARGET_AMIGA;// && flag_bbb_opts; - } - - virtual unsigned int - -From 7ea53a15d0e3f77f38f9383d8779c7755c499e4b Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Fri, 7 Apr 2017 04:07:36 +0200 -Subject: [PATCH 060/303] @B fix loop hang - ---- - gcc/bbb-opts.c | 35 ++++++++++++++++------------------- - 1 file changed, 16 insertions(+), 19 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index d9e77c53856d..c525ae432071 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -1240,7 +1240,7 @@ merge_add (void) - * Always prefer lower register numbers within the class. - */ - static unsigned --bb_reg_rename(void) -+bb_reg_rename (void) - { - unsigned change_count = 0; - for (unsigned index = 0; index < insns.size (); ++index) -@@ -1262,29 +1262,26 @@ execute_bbb_optimizations (void) - for (;;) - { - int done = 1; -- for (;;) -- { -- if (propagate_moves ()) -- done = 0, update_meta_data (); -+ if (propagate_moves ()) -+ done = 0, update_meta_data (); - -- if (offset_2_autoinc ()) -- done = 0, update_meta_data (); -+ if (offset_2_autoinc ()) -+ done = 0, update_meta_data (); - -- if (opt_strcpy ()) -- done = 0, update_meta_data (); -+ if (opt_strcpy ()) -+ done = 0, update_meta_data (); - -- if (commute_add_move ()) -- done = 0, update_meta_data (); -+ if (commute_add_move ()) -+ done = 0, update_meta_data (); - -- if (const_cmp_to_sub ()) -- done = 0, update_meta_data (); -+ if (const_cmp_to_sub ()) -+ done = 0, update_meta_data (); - -- if (merge_add ()) -- done = 0, update_meta_data (); -+ if (merge_add ()) -+ done = 0, update_meta_data (); - -- if (elim_dead_assign ()) -- done = 0, update_meta_data (); -- } -+ if (elim_dead_assign ()) -+ done = 0, update_meta_data (); - - if (bb_reg_rename ()) - done = 0, update_meta_data (); -@@ -1326,7 +1323,7 @@ namespace - virtual bool - gate (function *) - { -- return TARGET_AMIGA;// && flag_bbb_opts; -+ return TARGET_AMIGA; // && flag_bbb_opts; - } - - virtual unsigned int - -From cf6a128caf791e74460c8f312e624be2ab373b4e Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sat, 8 Apr 2017 17:06:18 +0200 -Subject: [PATCH 061/303] @N add option letters to -fbbb - ---- - gcc/config/m68k/amigaos.opt | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/gcc/config/m68k/amigaos.opt b/gcc/config/m68k/amigaos.opt -index 2d8bed0a9103..a5a14449dea9 100644 ---- gcc/config/m68k/amigaos.opt -+++ gcc/config/m68k/amigaos.opt -@@ -43,6 +43,6 @@ mcrt= - Target RejectNegative Var(amigaos_crt) Joined - Specify startup binary - --fbbb --Target Var(flag_bbb_opts,1) UInteger Init(0) -+fbbb= -+Target Var(flag_bbb_opts) Joined - Enable Bebbo's optimizations - -From 477bce8c47781fce8d11797829a3bd6ade798273 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Sat, 8 Apr 2017 17:07:04 +0200 -Subject: [PATCH 062/303] @B some fixes, also invoke regrename directly, @R use - letter from -fbbb= - ---- - gcc/bbb-opts.c | 347 ++++++++++++++++++++++++++++++++++++++++---------------- - gcc/regrename.c | 12 +- - 2 files changed, 260 insertions(+), 99 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index c525ae432071..737a5c00af3b 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -45,6 +45,7 @@ - #include "emit-rtl.h" - #include "tree-pass.h" - #include "conditions.h" -+#include "cselib.h" - #include <vector> - #include <map> - -@@ -110,14 +111,14 @@ struct insn_info - return t; - } - -- inline insn_info -- operator & (insn_info const & o) const -- { -- insn_info t; -- t._use = _use & o._use; -- t._def = _def & o._def; -- return t; -- } -+// inline insn_info -+// operator & (insn_info const & o) const -+// { -+// insn_info t; -+// t._use = _use & o._use; -+// t._def = _def & o._def; -+// return t; -+// } - - inline insn_info & - operator |= (insn_info const & o) -@@ -130,7 +131,7 @@ struct insn_info - inline insn_info & - operator &= (insn_info const & o) - { -- _use &= o._use; -+ _use &= o._use & o._def; - _def &= o._def; - return *this; - } -@@ -162,6 +163,18 @@ struct insn_info - - void - scan (rtx); -+ -+ unsigned -+ get_def_mask () const -+ { -+ if (!_def || _def > 0xffff) -+ return 0; -+ -+ unsigned mask = _def - 1; -+ if (_def > 0xff) -+ mask &= 0xff00; -+ return mask; -+ } - }; - - /* scan rtx for registers and set the corresponding flags. */ -@@ -192,6 +205,47 @@ insn_info::scan (rtx x) - } - } - -+/* perform reg renaming. */ -+static void -+do_reg_rename (rtx x, unsigned oldregno, unsigned newregno) -+{ -+ if (REG_P(x)) -+ { -+ if (REGNO(x) == oldregno) -+ df_ref_change_reg_with_loc (x, newregno); -+ return; -+ } -+ -+ if (x == cc0_rtx) -+ return; -+ -+ RTX_CODE code = GET_CODE(x); -+ const char *fmt = GET_RTX_FORMAT(code); -+ for (int i = GET_RTX_LENGTH (code) - 1; i >= 0; i--) -+ { -+ if (fmt[i] == 'e') -+ do_reg_rename (XEXP(x, i), oldregno, newregno); -+ else if (fmt[i] == 'E') -+ for (int j = XVECLEN (x, i) - 1; j >= 0; j--) -+ do_reg_rename (XVECEXP(x, i, j), oldregno, newregno); -+ } -+} -+ -+static int -+bit2regno (unsigned bit) -+{ -+ if (!bit) -+ return -1; -+ -+ unsigned regno = 0; -+ while (!(bit & 1)) -+ { -+ ++regno; -+ bit >>= 1; -+ } -+ return regno; -+} -+ - /* - * Collect some data. - */ -@@ -212,22 +266,25 @@ clear (void) - infos.clear (); - } - -+/* -+ * return true if the register is DEAD. -+ */ - static bool - is_reg_dead (unsigned regno, unsigned pos) - { -- if (pos >= infos.size ()) -- return true; -- -- insn_info & ii0 = infos[pos++]; -- if (!ii0.is_use (regno)) -- return true; -- -- if (pos >= infos.size ()) -- return true; -- -- insn_info & ii1 = infos[pos]; -+ for(;;) { -+ if (pos + 1 >= infos.size ()) -+ return true; -+ -+ rtx_insn * insn = insns[pos + 1]; -+ if (!LABEL_P(insn) && GET_CODE(insn) != USE) -+ break; -+ ++pos; -+ } - -- return !ii1.is_use (regno); -+ insn_info & ii0 = infos[pos + 1]; -+ // not dead if usage is reported in the next statement -+ return !ii0.is_use (regno); - } - - /* -@@ -242,6 +299,8 @@ dump_insns (char const * name) - { - insn_info & ii = infos[i]; - -+ fprintf(stderr, "%d: ", i); -+ - for (int j = 0; j < 8; ++j) - if (ii.is_use (j)) - fprintf (stderr, ii.is_def (j) ? "*d%d " : "d%d ", j); -@@ -301,6 +360,9 @@ update_meta_data () - std::pair<unsigned, insn_info> p = *todo.rbegin (); - todo.pop_back (); - -+// fprintf(stderr, "%d ", p.first); -+// dump_insns("update"); -+ - insn_info ii = p.second; - - for (int pos = p.first; pos >= 0; --pos) -@@ -655,9 +717,8 @@ propagate_moves () - REGNO(srci), REGNO(dsti)); - - /* Move in front of loop and mark as dead. */ -- remove_insn (ii); -- add_insn_after (ii, before, 0); -- add_reg_note (ii, REG_DEAD, srci); -+ rtx_insn * newii = make_insn_raw(PATTERN(ii)); -+ SET_INSN_DELETED(ii); - - /* Plus check if the reg was just loaded. */ - if (bset) -@@ -665,22 +726,31 @@ propagate_moves () - rtx bdst = SET_DEST(bset); - if (REG_P(bdst) && REGNO(bdst) == REGNO(srci)) - { -- SET_DEST(bset) = dsti; -- SET_INSN_DELETED(ii); -+ SET_SRC(PATTERN(newii)) = SET_SRC(bset); -+// SET_INSN_DELETED(ii); - } - } -+ else -+ add_reg_note (newii, REG_DEAD, srci); -+ -+ -+ add_insn_after (newii, before, 0); -+ - - /* Move behind loop - into next BB. */ -- remove_insn (jj); -- add_insn_before (jj, after, 0); -+ rtx_insn * newjj = make_insn_raw(PATTERN(jj)); -+ add_insn_before (newjj, after, 0); -+ SET_INSN_DELETED(jj); - - reg_reg.erase (j); - reg_reg.erase (i); - j = reg_reg.end (); - inc = false; - -- df_insn_rescan (ii); -- df_insn_rescan (jj); -+// df_insn_rescan (ii); -+// df_insn_rescan (jj); -+ df_insn_rescan (newii); -+ df_insn_rescan (newjj); - - /* add fixes if there were jumps out of the loop. */ - if (jump_out.size ()) -@@ -761,17 +831,11 @@ opt_strcpy () - int num_clobbers_to_add = 0; - int insn_code_number; - -- SET_SRC(single_set(reg2x)) = SET_SRC(single_set (x2reg)); -- insn_code_number = recog (PATTERN (reg2x), reg2x, &num_clobbers_to_add); -- -- if (insn_code_number < 0 || !check_asm_operands (reg2x)) -+ rtx_insn * newinsn = make_insn_raw ( -+ gen_rtx_SET(SET_DEST(single_set(reg2x)), SET_SRC(single_set (x2reg)))); -+ insn_code_number = recog (PATTERN (newinsn), newinsn, &num_clobbers_to_add); -+ if (insn_code_number >= 0 && check_asm_operands (PATTERN (newinsn))) - { -- /* restore register. */ -- SET_SRC(single_set(reg2x)) = SET_DEST(single_set (x2reg)); -- } -- else -- { -- - rtx link; - - fprintf ( -@@ -779,6 +843,8 @@ opt_strcpy () - ":bbb: opt_strcpy condition met, removing compare and joining insns - omit reg %d\n", - REGNO(dst)); - -+ SET_SRC(single_set(reg2x)) = SET_SRC(single_set (x2reg)); -+ - for (link = REG_NOTES(x2reg); link; link = XEXP(link, 1)) - if (REG_NOTE_KIND (link) != REG_LABEL_OPERAND) - { -@@ -935,16 +1001,20 @@ commute_add_move (void) - rtx pinc = gen_rtx_POST_INC(GET_MODE(dst), reg1dst); - rtx newmem = replace_equiv_address_nv (dst, pinc); - -+ rtx_insn * newinsn = make_insn_raw (gen_rtx_SET(reg1dst, reg1src)); -+ if (recog (PATTERN (newinsn), newinsn, 0) < 0 || !check_asm_operands (PATTERN (newinsn))) -+ continue; -+ - if (validate_change (next, &SET_DEST(set2), newmem, 0)) - { -+ fprintf (stderr, ":bbb: commute_add_move found\n"); -+ - SET_INSN_DELETED(insn); - -- insn = emit_insn_before (gen_movsi (reg1dst, reg1src), next); -+ insn = emit_insn_before (newinsn, next); - - add_reg_note (next, REG_INC, reg1dst); - -- fprintf (stderr, ":bbb: commute_add_move found\n"); -- - df_insn_rescan (insn); - df_insn_rescan (next); - -@@ -1037,18 +1107,11 @@ const_cmp_to_sub (void) - rtx reg = dstp == left ? right : left; - rtx plus = gen_rtx_PLUS(mode, reg, gen_rtx_CONST_INT (mode, intval)); - -- SET_SRC(setp) = plus; -- SET_DEST(setp) = reg; -+ rtx_insn * neuprev = make_insn_raw (gen_rtx_SET(reg, plus)); - - int num_clobbers_to_add = 0; -- int insn_code_number = recog (PATTERN (prev), prev, &num_clobbers_to_add); -- if (insn_code_number >= 0 && !check_asm_operands (prev)) -- insn_code_number = -1; -- -- SET_SRC(setp) = srcp; -- SET_DEST(setp) = dstp; -- -- if (insn_code_number < 0) -+ int insn_code_number = recog (PATTERN (neuprev), neuprev, &num_clobbers_to_add); -+ if (insn_code_number >= 0 && !check_asm_operands (PATTERN (neuprev))) - continue; - - // also convert current statement to cmp #0, reg -@@ -1058,11 +1121,11 @@ const_cmp_to_sub (void) - add_reg_note (insn, REG_DEAD, reg); - - SET_INSN_DELETED(prev); -- neu = gen_rtx_SET(reg, plus); -- prev = emit_insn_before (neu, insn); -+ prev = emit_insn_before (neuprev, insn); - - // urks - unknown side effects - // int omitted_regno = REGNO(dstp); -+// cselib_invalidate_rtx (dstp); - // if (!(df->hard_regs_live_count[omitted_regno] -= 2)) - // df_set_regs_ever_live (omitted_regno, false); - -@@ -1159,7 +1222,7 @@ elim_dead_assign (void) - if (!REG_P(dst) || !REG_P(src)) - continue; - -- if (!infos[index].is_use (REGNO(dst))) -+ if (is_reg_dead(REGNO(dst),index)) - { - fprintf (stderr, ":bbb: elim_dead_assign to %d\n", REGNO(dst)); - SET_INSN_DELETED(insn); -@@ -1227,7 +1290,7 @@ merge_add (void) - if (REGNO(dst1) != REGNO(dst2) || REGNO(r2) != REGNO(dst3)) - continue; - -- fprintf (stderr, ": merge_add pattern found\n"); -+ fprintf (stderr, ":bbb: merge_add applied\n"); - - SET_SRC(set1) = l1; - remove_insn (ins2); -@@ -1242,60 +1305,82 @@ merge_add (void) - static unsigned - bb_reg_rename (void) - { -- unsigned change_count = 0; -+ dump_insns("bb_reg_rename"); - for (unsigned index = 0; index < insns.size (); ++index) - { -- } -- return change_count; --} -+ insn_info & ii = infos[index]; -+ const unsigned def = ii._def; -+ unsigned mask = ii.get_def_mask (); - --/* Main entry point to the pass. */ --static unsigned int --execute_bbb_optimizations (void) --{ -- df_set_flags (DF_LR_RUN_DCE + DF_DEFER_INSN_RESCAN); -- df_note_add_problem (); -- df_analyze (); -+ if (!mask) -+ continue; - -- update_meta_data (); -+ std::vector<unsigned> found; -+ std::vector<unsigned> todo; -+ if (index + 1 < insns.size ()) -+ todo.push_back (index + 1); - -- for (;;) -- { -- int done = 1; -- if (propagate_moves ()) -- done = 0, update_meta_data (); -+ found.push_back (index); -+ /* a register was defined, follow all branches. */ -+ while (todo.size ()) -+ { -+ unsigned pos = todo[todo.size () - 1]; -+ todo.pop_back (); - -- if (offset_2_autoinc ()) -- done = 0, update_meta_data (); -+ insn_info & jj = infos[pos]; -+ /* defined again. */ -+ if (jj._def & def) -+ continue; - -- if (opt_strcpy ()) -- done = 0, update_meta_data (); -+ /* not referenced. */ -+ if (!(jj._use & def)) -+ continue; - -- if (commute_add_move ()) -- done = 0, update_meta_data (); -+ /* update free regs. */ -+ mask &= ~jj._use; -+ if (!mask) -+ break; - -- if (const_cmp_to_sub ()) -- done = 0, update_meta_data (); -+ found.push_back (pos); - -- if (merge_add ()) -- done = 0, update_meta_data (); -+ /* follow jump and/or next insn. */ -+ rtx_insn * insn = insns[index]; -+ if (JUMP_P(insn)) -+ { -+ std::map<rtx_insn *, unsigned>::iterator j = insn2index.find ((rtx_insn *) JUMP_LABEL(insn)); -+ if (j != insn2index.end ()) -+ todo.push_back (j->second); - -- if (elim_dead_assign ()) -- done = 0, update_meta_data (); -+ rtx jmppattern = PATTERN (insn); - -- if (bb_reg_rename ()) -- done = 0, update_meta_data (); -+ rtx jmpsrc = XEXP(jmppattern, 1); -+ if (GET_CODE(jmpsrc) == IF_THEN_ELSE) -+ if (pos + 1 < insns.size ()) -+ todo.push_back (pos + 1); -+ } -+ else if (pos + 1 < insns.size ()) -+ todo.push_back (pos + 1); -+ } - -- if (done) -- break; -- } -+ if (mask) -+ { -+ int oldregno = bit2regno (def); -+ int newregno = bit2regno (mask); -+ fprintf (stderr, ":bbb: bb_reg_rename %d -> %d\n", oldregno, newregno); - --// dump_insns ("bbb 1"); -- clear (); -+ for (std::vector<unsigned>::iterator i = found.begin (); i != found.end (); ++i) -+ do_reg_rename (PATTERN (insns[*i]), oldregno, newregno); - -+ cselib_invalidate_rtx (gen_raw_REG (SImode, oldregno)); -+ cselib_invalidate_rtx (gen_raw_REG (SImode, newregno)); -+ return 1; -+ } -+ } - return 0; - } - -+extern class opt_pass * global_pass_regrename; -+ - namespace - { - -@@ -1315,7 +1400,7 @@ namespace - { - public: - pass_bbb_optimizations (gcc::context *ctxt) : -- rtl_opt_pass (pass_data_bbb_optimizations, ctxt) -+ rtl_opt_pass (pass_data_bbb_optimizations, ctxt), pp (0) - { - } - -@@ -1323,7 +1408,7 @@ namespace - virtual bool - gate (function *) - { -- return TARGET_AMIGA; // && flag_bbb_opts; -+ return TARGET_AMIGA && flag_bbb_opts; - } - - virtual unsigned int -@@ -1335,13 +1420,81 @@ namespace - opt_pass * - clone () - { -- return new pass_bbb_optimizations (m_ctxt); -+ pass_bbb_optimizations * bbb = new pass_bbb_optimizations (m_ctxt); -+ // bbb->pp = pp + 1; -+ return bbb; - } - -+ unsigned int pp; -+ -+ unsigned -+ execute_bbb_optimizations (void); - }; - // class pass_bbb_optimizations - --}// anon namespace -+ -+ /* Main entry point to the pass. */ -+ unsigned -+ pass_bbb_optimizations::execute_bbb_optimizations (void) -+ { -+ df_set_flags (DF_LR_RUN_DCE + DF_DEFER_INSN_RESCAN); -+ df_note_add_problem (); -+ df_analyze (); -+ -+ update_meta_data (); -+ -+ bool do_opt_strcpy = strchr(flag_bbb_opts, 's') || strchr(flag_bbb_opts, '*'); -+ bool do_commute_add_move = strchr(flag_bbb_opts, 'a') || strchr(flag_bbb_opts, '*'); -+ bool do_propagate_moves = strchr(flag_bbb_opts, 'p') || strchr(flag_bbb_opts, '*'); -+ bool do_const_cmp_to_sub = strchr(flag_bbb_opts, 'c') || strchr(flag_bbb_opts, '*'); -+ bool do_merge_add = strchr(flag_bbb_opts, 'm') || strchr(flag_bbb_opts, '*'); -+ bool do_elim_dead_assign = strchr(flag_bbb_opts, 'e') || strchr(flag_bbb_opts, '*'); -+ bool do_bb_reg_rename = strchr(flag_bbb_opts, 'r') || strchr(flag_bbb_opts, '*'); -+ -+ -+ for (;;) -+ { -+ int done = 1; -+ if (do_opt_strcpy && opt_strcpy ()) -+ done = 0, update_meta_data (); -+ -+ if (do_commute_add_move && commute_add_move ()) -+ done = 0, update_meta_data (); -+ -+ if (do_propagate_moves && propagate_moves ()) -+ done = 0, update_meta_data (); -+ -+// if (offset_2_autoinc ()) -+// done = 0, update_meta_data (); -+ -+ if (do_const_cmp_to_sub && const_cmp_to_sub ()) -+ done = 0, update_meta_data (); -+ -+ if (do_merge_add && merge_add ()) -+ done = 0, update_meta_data (); -+ -+ if (do_elim_dead_assign && elim_dead_assign ()) -+ done = 0, update_meta_data (); -+ -+// if (do_bb_reg_rename && bb_reg_rename ()) -+// done = 0, update_meta_data (); -+ if (done) -+ break; -+ } -+ -+ if (do_bb_reg_rename && ::global_pass_regrename) -+ { -+ class opt_pass * rr = ::global_pass_regrename->clone(); -+ rr->execute(0); -+ } -+ -+ if (strchr(flag_bbb_opts, 'X')) dump_insns ("bbb 1"); -+ clear (); -+ -+ return 0; -+ } -+ -+} // anon namespace - - rtl_opt_pass * - make_pass_bbb_optimizations (gcc::context * ctxt) -diff --git a/gcc/regrename.c b/gcc/regrename.c -index 4ba825e8d8e8..696e5557780e 100755 ---- gcc/regrename.c -+++ gcc/regrename.c -@@ -1913,6 +1913,8 @@ regrename_optimize (void) - return 0; - } - -+class opt_pass * global_pass_regrename; -+ - namespace { - - const pass_data pass_data_regrename = -@@ -1927,13 +1929,14 @@ const pass_data pass_data_regrename = - 0, /* todo_flags_start */ - TODO_df_finish, /* todo_flags_finish */ - }; -- - class pass_regrename : public rtl_opt_pass - { - public: - pass_regrename (gcc::context *ctxt) - : rtl_opt_pass (pass_data_regrename, ctxt) -- {} -+ { -+ ::global_pass_regrename = this; -+ } - - /* opt_pass methods: */ - virtual bool gate (function *) -@@ -1943,6 +1946,11 @@ class pass_regrename : public rtl_opt_pass - - virtual unsigned int execute (function *) { return regrename_optimize (); } - -+ opt_pass * clone () -+ { -+ return new pass_regrename(m_ctxt); -+ } -+ - }; // class pass_regrename - - } // anon namespace - -From b747a5666a06f73ae8628788246f6d9e614f6393 Mon Sep 17 00:00:00 2001 -From: bebbo <bebbo(a)bejy.net> -Date: Mon, 10 Apr 2017 10:46:07 +0200 -Subject: [PATCH 063/303] @B shrink_stack_frame starts working - ---- - gcc/bbb-opts.c | 583 ++++++++++++++++++++++++++++++++++++++++++--------------- - gcc/passes.def | 1 - - 2 files changed, 427 insertions(+), 157 deletions(-) - -diff --git a/gcc/bbb-opts.c b/gcc/bbb-opts.c -index 737a5c00af3b..6114e2fa5ed0 100755 ---- gcc/bbb-opts.c -+++ gcc/bbb-opts.c -@@ -111,15 +111,6 @@ struct insn_info - return t; - } - --// inline insn_info --// operator & (insn_info const & o) const --// { --// insn_info t; --// t._use = _use & o._use; --// t._def = _def & o._def; --// return t; --// } -- - inline insn_info & - operator |= (insn_info const & o) - { -@@ -250,6 +241,7 @@ bit2regno (unsigned bit) - * Collect some data. - */ - static std::vector<rtx_insn *> insns; -+static std::vector<rtx_insn *> temp; - static std::vector<rtx_insn *> jumps; - static std::map<rtx_insn *, unsigned> insn2index; - static std::vector<insn_info> infos; -@@ -272,15 +264,16 @@ clear (void) - static bool - is_reg_dead (unsigned regno, unsigned pos) - { -- for(;;) { -- if (pos + 1 >= infos.size ()) -- return true; -- -- rtx_insn * insn = insns[pos + 1]; -- if (!LABEL_P(insn) && GET_CODE(insn) != USE) -- break; -- ++pos; -- } -+ for (;;) -+ { -+ if (pos + 1 >= infos.size ()) -+ return true; -+ -+ rtx_insn * insn = insns[pos + 1]; -+ if (!LABEL_P(insn) && GET_CODE(insn) != USE) -+ break; -+ ++pos; -+ } - - insn_info & ii0 = infos[pos + 1]; - // not dead if usage is reported in the next statement -@@ -292,14 +285,19 @@ is_reg_dead (unsigned regno, unsigned pos) - * Sometimes used during debugging. - */ - static void --dump_insns (char const * name) -+dump_insns (char const * name, bool all) - { - fprintf (stderr, "====================================: %s\n", name); -+ if (all) -+ { -+ for (rtx_insn * insn = get_insns (); insn && insn != insns[0]; insn = NEXT_INSN (insn)) -+ debug_rtx (insn); -+ } - for (unsigned i = 0; i < insns.size (); ++i) - { - insn_info & ii = infos[i]; - -- fprintf(stderr, "%d: ", i); -+ fprintf (stderr, "%d: ", i); - - for (int j = 0; j < 8; ++j) - if (ii.is_use (j)) -@@ -314,6 +312,13 @@ dump_insns (char const * name) - - fprintf (stderr, "\t"); - debug_rtx (insns[i]); -+ -+ if (all) -+ { -+ rtx_insn * p = i + 1 < insns.size () ? insns[i + 1] : 0; -+ for (rtx_insn * q = NEXT_INSN (insns[i]); q && q != p; q = NEXT_INSN (q)) -+ debug_rtx (q); -+ } - } - } - -@@ -321,7 +326,7 @@ dump_insns (char const * name) - * Create a filtered view of insns - keep only those to work with. - */ - static void --update_meta_data () -+update_insns () - { - rtx_insn *insn, *next; - clear (); -@@ -342,7 +347,11 @@ update_meta_data () - insns.push_back (insn); - } - } -+} - -+static void -+update_insn_infos (void) -+{ - /* prepare insn_info */ - insn_info ii; - for (unsigned i = 0; i < insns.size (); ++i) -@@ -360,14 +369,13 @@ update_meta_data () - std::pair<unsigned, insn_info> p = *todo.rbegin (); - todo.pop_back (); - --// fprintf(stderr, "%d ", p.first); --// dump_insns("update"); -- - insn_info ii = p.second; - - for (int pos = p.first; pos >= 0; --pos) - { - rtx_insn * insn = insns[pos]; -+ if (!insn) // moved to temp for stack frame cleanup -+ continue; - - if (pass && infos[pos].contains (ii)) - break; -@@ -487,7 +495,6 @@ update_meta_data () - } - ++pass; - } -- - } - - /* -@@ -717,7 +724,7 @@ propagate_moves () - REGNO(srci), REGNO(dsti)); - - /* Move in front of loop and mark as dead. */ -- rtx_insn * newii = make_insn_raw(PATTERN(ii)); -+ rtx_insn * newii = make_insn_raw (PATTERN (ii)); - SET_INSN_DELETED(ii); - - /* Plus check if the reg was just loaded. */ -@@ -733,12 +740,10 @@ propagate_moves () - else - add_reg_note (newii, REG_DEAD, srci); - -- - add_insn_after (newii, before, 0); - -- - /* Move behind loop - into next BB. */ -- rtx_insn * newjj = make_insn_raw(PATTERN(jj)); -+ rtx_insn * newjj = make_insn_raw (PATTERN (jj)); - add_insn_before (newjj, after, 0); - SET_INSN_DELETED(jj); - -@@ -895,47 +900,6 @@ opt_strcpy () - return change_count; - } - --/* -- * Convert loops using a counting reg as offset with an address reg -- * into a loop with auto inc address regs. -- */ --static unsigned --offset_2_autoinc (void) --{ -- unsigned change_count = 0; --#if 0 -- rtx_insn * reg_const = 0; -- -- for (unsigned index = 0; index < insns.size (); ++index) -- { -- rtx_insn * insn = insns[index]; -- -- if (!next || !LABEL_P(next) || LABEL_NUSES(next) != 1) -- continue; -- -- if (!NONJUMP_INSN_P(insn)) -- continue; -- -- rtx use = single_set (insn); -- if (!use) -- continue; -- -- rtx reg = SET_DEST(use); -- if (!REG_P(reg)) -- continue; -- -- rtx val = SET_SRC(use); -- --// fprintf(stderr, "possible start for offset_2_autoinc\n"); --// //debug_rtx(insn); --// //debug_rtx(next); -- -- } -- --#endif -- return change_count; --} -- - /* - * convert - * -@@ -1052,7 +1016,7 @@ const_cmp_to_sub (void) - { - unsigned change_count = 0; - #if HAVE_cc0 -- for (unsigned index = 1; index + 1 < insns.size (); ++index) -+ for (unsigned index = insns.size () - 2; index > 0; --index) - { - rtx_insn * insn = insns[index]; - rtx seti = single_set (insn); -@@ -1072,13 +1036,13 @@ const_cmp_to_sub (void) - if (!REG_P(left) || !REG_P(right)) - continue; - --// if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) --// continue; -- - // TODO - // FEATURE: check if the next uses are also a add/sub - // then maybe that add/sub can be adjusted too - -+ // if (!find_reg_note (insn, REG_DEAD, left) || !find_reg_note (insn, REG_DEAD, right)) -+ // continue; -+ // use own reg_dead - if (!is_reg_dead (REGNO(left), index) || !is_reg_dead (REGNO(right), index)) - continue; - -@@ -1222,7 +1186,7 @@ elim_dead_assign (void) - if (!REG_P(dst) || !REG_P(src)) - continue; - -- if (is_reg_dead(REGNO(dst),index)) -+ if (is_reg_dead (REGNO(dst), index)) - { - fprintf (stderr, ":bbb: elim_dead_assign to %d\n", REGNO(dst)); - SET_INSN_DELETED(insn); -@@ -1278,8 +1242,8 @@ merge_add (void) - continue; - - rtx l1 = XEXP(src1, 0); -- rtx l2 = XEXP(src2, 0); -- rtx l3 = XEXP(src3, 0); -+// rtx l2 = XEXP(src2, 0); -+// rtx l3 = XEXP(src3, 0); - - rtx r1 = XEXP(src1, 1); - rtx r2 = XEXP(src2, 1); -@@ -1293,89 +1257,393 @@ merge_add (void) - fprintf (stderr, ":bbb: merge_add applied\n"); - - SET_SRC(set1) = l1; -- remove_insn (ins2); -- add_insn_after (ins2, ins3, 0); -+ rtx_insn * newins2 = make_insn_raw (PATTERN (ins2)); -+ add_insn_after (newins2, ins3, 0); -+ SET_INSN_DELETED(ins2); -+ df_insn_rescan (ins1); - } - return change_count; - } - --/* -- * Always prefer lower register numbers within the class. -+static void -+clear_temp () -+{ -+ for (unsigned i = 0; i < temp.size (); ++i) -+ if (temp[i]) -+ insns[i] = temp[i], temp[i] = 0; -+} -+ -+/** -+ * 1. scan for all used registers. -+ * 2. scan the stack from for omittable push/pop -+ * 3. adjust stack frame + insns referring to stack pointer -+ * typical code: -+ subq.l #4,sp -+ movem.l #16190,-(sp) -+ move.l 52(sp),d2 -+ move.l 56(sp),d3 -+ -+ * or -+ link a5,#4 -+ movem.l #16190,-(sp) -+ move.l 8(a5),d2 -+ move.l 12(a5),d3 -+ * -+ * => with a5 check only prolog/epilog -+ * => without a5 adjust insns referring sp if offset > startoffset + current sp diff -+ * -+ * startvalue count(pushes)*4 -+ * newstartvalue = startvalue - omitted pushes - */ - static unsigned --bb_reg_rename (void) -+shrink_stack_frame (void) - { -- dump_insns("bb_reg_rename"); -- for (unsigned index = 0; index < insns.size (); ++index) -+ /* nothing to do. */ -+ if (!insns.size ()) -+ return 0; -+ -+ temp.resize (insns.size ()); -+ -+ unsigned pos = 0; -+ rtx_insn * insn = insns[pos]; -+ if (JUMP_P(insn)) /* return -> empty function*/ -+ return 0; -+ -+ bool usea5 = false; -+ unsigned paramstart = 4; -+ /* -+ * Move prologue to temp. -+ * Only register push and parallel insn unless its a link a5 are moved. -+ */ -+ rtx_insn * prev = get_insns (); -+ for (; pos < insns.size ();) - { -- insn_info & ii = infos[index]; -- const unsigned def = ii._def; -- unsigned mask = ii.get_def_mask (); -+ insn = insns[pos]; - -- if (!mask) -- continue; -+ /* check for prologue end. */ -+ for (; prev != insn; prev = NEXT_INSN (prev)) -+ if (NOTE_P(prev) && NOTE_KIND(prev) == NOTE_INSN_PROLOGUE_END) -+ break; -+ if (prev != insn) -+ break; -+ -+ rtx pattern = PATTERN (insn); -+ if (GET_CODE(pattern) == PARALLEL) -+ { -+ rtx set = XVECEXP(pattern, 0, 0); -+ rtx dst = SET_DEST(set); -+ /* ignore link a5 */ -+ if (REG_P(dst) && REGNO(dst) == 13) -+ usea5 = true; -+ else -+ { -+ /* use movem */ -+ temp[pos] = insn; -+ insns[pos] = 0; -+ } -+ ++pos; -+ continue; -+ } -+ if (GET_CODE(pattern) != SET) -+ { -+ ++pos; -+ continue; -+ } -+ -+ /* move only the push statements. */ -+ rtx src = SET_SRC(pattern); -+ rtx dest = SET_DEST(pattern); -+ if (REG_P(src)) -+ { -+ if (MEM_P(dest)) -+ { -+ rtx predec = XEXP(dest, 0); -+ if (GET_CODE(predec) == PRE_DEC) -+ { -+ rtx reg = XEXP(predec, 0); -+ if (REG_P(reg) && REGNO(reg) == 15) -+ { -+ temp[pos] = insn; -+ insns[pos] = 0; -+ } -+ } -+ } -+ } -+ else if (GET_CODE(src) == PLUS && REG_P(dest) && REGNO(dest) == 15) -+ { -+ /* check for stack variables. */ -+ rtx reg = XEXP(src, 0); -+ rtx cx = XEXP(src, 1); -+ if (REG_P(reg) && REGNO(reg) == 15 && CONST_INT_P(cx)) -+ paramstart -= INTVAL(cx); -+ } -+ -+ if (++pos >= insns.size ()) -+ { -+ clear_temp (); -+ return 0; -+ } -+ } - -- std::vector<unsigned> found; -- std::vector<unsigned> todo; -- if (index + 1 < insns.size ()) -- todo.push_back (index + 1); -+ if (pos == 0) -+ return 0; -+ -+ unsigned prologueend = pos; - -- found.push_back (index); -- /* a register was defined, follow all branches. */ -- while (todo.size ()) -+ /* search epilogues - there can be multiple epilogues. */ -+ while (pos < insns.size ()) -+ { -+ while (pos < insns.size ()) - { -- unsigned pos = todo[todo.size () - 1]; -- todo.pop_back (); -+ insn = insns[pos]; -+ for (; prev != insn; prev = NEXT_INSN (prev)) -+ if (NOTE_P(prev) && NOTE_KIND(prev) == NOTE_INSN_EPILOGUE_BEG) -+ break; - -- insn_info & jj = infos[pos]; -- /* defined again. */ -- if (jj._def & def) -- continue; -+ if (prev != insn) -+ break; - -- /* not referenced. */ -- if (!(jj._use & def)) -- continue; -+ ++pos; -+ } - -- /* update free regs. */ -- mask &= ~jj._use; -- if (!mask) -+ /* move epilogues away. */ -+ for (; pos < insns.size (); ++pos) -+ { -+ insn = insns[pos]; -+ if (JUMP_P(insn)) /* return */ - break; - -- found.push_back (pos); -+ if (LABEL_P(insn)) -+ break; - -- /* follow jump and/or next insn. */ -- rtx_insn * insn = insns[index]; -- if (JUMP_P(insn)) -+ /* omitt the frame pointer a5. */ -+ rtx pattern = PATTERN (insn); -+ if (GET_CODE(pattern) == PARALLEL) - { -- std::map<rtx_insn *, unsigned>::iterator j = insn2index.find ((rtx_insn *) JUMP_LABEL(insn)); -- if (j != insn2index.end ()) -- todo.push_back (j->second); -+ rtx set = XVECEXP(pattern, 0, 0); -+ rtx dst = SET_DEST(set); -+ /* unlink is last. */ -+ if (REG_P(dst) && REGNO(dst) == 13) -+ break; -+ -+ /* movem. */ -+ temp[pos] = insn; -+ insns[pos] = 0; -+ } -+ else if (GET_CODE(pattern) == SET) -+ { -+ /* check for move (a7+), x */ -+ rtx src = SET_SRC(pattern); -+ rtx dst = SET_DEST(pattern); -+ if (REG_P(dst)) -+ { -+ if (MEM_P(src)) -+ { -+ rtx postinc = XEXP(src, 0); -+ if (GET_CODE(postinc) == POST_INC) -+ { -+ rtx reg = XEXP(postinc, 0); -+ if (REG_P(reg) && REGNO(reg) == 15) -+ { -+ temp[pos] = insn; -+ insns[pos] = 0; -+ } -+ } -+ } -+ } -+ } -+ } -+ ++pos; -+ } -+ /* gather usage stats without prologue/epilogue */ -+ update_insn_infos (); -+ insn_info ii; -+ for (unsigned i = 0; i < infos.size (); ++i) -+ ii |= infos[i]; -+ unsigned freemask = ~ii._use; - -- rtx jmppattern = PATTERN (insn); -+ rtx a7 = gen_raw_REG (SImode, 15); - -- rtx jmpsrc = XEXP(jmppattern, 1); -- if (GET_CODE(jmpsrc) == IF_THEN_ELSE) -- if (pos + 1 < insns.size ()) -- todo.push_back (pos + 1); -+ unsigned adjust = 0; -+ /* now all push/pop insns are in temp. */ -+ for (unsigned i = 0; i < temp.size (); ++i) -+ { -+ insn = temp[i]; -+ if (!insn) -+ continue; -+ -+ rtx pattern = PATTERN (insn); -+ /* check the pushed regs, either a vector or single statements */ -+ if (GET_CODE(pattern) == PARALLEL) -+ { -+ std::vector<rtx> regs; -+ std::vector<rtx> clobbers; -+ for (int j = 0; j < XVECLEN(pattern, 0); ++j) -+ { -+ rtx set = XVECEXP(pattern, 0, j); -+ if (GET_CODE(set) == CLOBBER) -+ { -+ clobbers.push_back (set); -+ continue; -+ } -+ rtx src = SET_SRC(set); -+ rtx dst = SET_DEST(set); -+ rtx reg; -+ if (MEM_P(src)) -+ reg = dst; -+ else if (MEM_P(dst)) -+ reg = src; -+ else -+ continue; -+ -+ if (i < prologueend) -+ paramstart += 4; -+ unsigned regbit = 1 << REGNO(reg); -+ if (freemask & regbit) -+ { -+ fprintf (stderr, i < prologueend ? "remove push for %d\n" : "remove pop for %d\n", REGNO(reg)); -+ if (i < prologueend) -+ adjust += 4; -+ } -+ else -+ regs.push_back (reg); -+ } -+ -+ /* don't touch - clobbers! */ -+ if (clobbers.size()) -+ continue; -+ -+ if ((int) regs.size () + 1 < XVECLEN(pattern, 0) || regs.size () <= 2) -+ { -+ if (regs.size () <= 2) -+ { -+ for (unsigned k = 0; k < regs.size (); ++k) -+ { -+ rtx reg = regs[k]; -+ if (i < prologueend) -+ { -+ /* push */ -+ rtx dec = gen_rtx_PRE_DEC(SImode, a7); -+ rtx mem = gen_rtx_MEM (SImode, dec); -+ rtx set = gen_rtx_SET(mem, reg); -+ emit_insn_after (set, insn); -+ } -+ else -+ { -+ /* pop */ -+ rtx dec = gen_rtx_POST_INC(SImode, a7); -+ rtx mem = gen_rtx_MEM (SImode, dec); -+ rtx set = gen_rtx_SET(reg, mem); -+ emit_insn_before (set, insn); -+ } -+ } -+ } -+ else -+ { -+ rtx parallel = gen_rtx_PARALLEL(VOIDmode, rtvec_alloc (regs.size () + 1)); -+ int x = regs.size () * 4 + 4; -+ -+ rtx plus = gen_rtx_PLUS(SImode, a7, gen_rtx_CONST_INT (SImode, i < prologueend ? -x : x)); -+ XVECEXP(parallel, 0, 0) = gen_rtx_SET(a7, plus); -+ -+ if (i >= prologueend) -+ x = 0; -+ -+ for (unsigned k = 0; k < regs.size (); ++k) -+ { -+ if (i < prologueend) -+ { -+ /* push */ -+ plus = gen_rtx_PLUS(SImode, a7, gen_rtx_CONST_INT (SImode, -x)); -+ x -= 4; -+ rtx mem = gen_rtx_MEM (SImode, plus); -+ rtx set = gen_rtx_SET(mem, regs[k]); -+ XVECEXP(parallel, 0, k + 1) = set; -+ } -+ else -+ { -+ /* pop */ -+ plus = x ? gen_rtx_PLUS(SImode, a7, gen_rtx_CONST_INT (SImode, x)) : a7; -+ x += 4; -+ rtx mem = gen_rtx_MEM (SImode, plus); -+ rtx set = gen_rtx_SET(regs[k], mem); -+ XVECEXP(parallel, 0, k + 1) = set; -+ } -+ } -+ emit_insn_after (parallel, insn); -+ } -+ SET_INSN_DELETED(insn); -+ } -+ } -+ else -+ { -+ rtx set = PATTERN (insn); -+ -+ if (i < prologueend) -+ { -+ /* move x,-(a7). */ -+ paramstart += 4; -+ rtx src = SET_SRC(set); -+ unsigned regbit = 1 << REGNO(src); -+ if (freemask & regbit) -+ { -+ adjust += 4; -+ fprintf (stderr, "remove push for %d\n", REGNO(src)); -+ S

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

netsurf-commits January 2018