head 1.2; access; symbols pkgsrc-2026Q1:1.2.0.4 pkgsrc-2026Q1-base:1.2 pkgsrc-2025Q4:1.2.0.2 pkgsrc-2025Q4-base:1.2 pkgsrc-2025Q3:1.1.1.1.0.114 pkgsrc-2025Q3-base:1.1.1.1 pkgsrc-2025Q2:1.1.1.1.0.112 pkgsrc-2025Q2-base:1.1.1.1 pkgsrc-2025Q1:1.1.1.1.0.110 pkgsrc-2025Q1-base:1.1.1.1 pkgsrc-2024Q4:1.1.1.1.0.108 pkgsrc-2024Q4-base:1.1.1.1 pkgsrc-2024Q3:1.1.1.1.0.106 pkgsrc-2024Q3-base:1.1.1.1 pkgsrc-2024Q2:1.1.1.1.0.104 pkgsrc-2024Q2-base:1.1.1.1 pkgsrc-2024Q1:1.1.1.1.0.102 pkgsrc-2024Q1-base:1.1.1.1 pkgsrc-2023Q4:1.1.1.1.0.100 pkgsrc-2023Q4-base:1.1.1.1 pkgsrc-2023Q3:1.1.1.1.0.98 pkgsrc-2023Q3-base:1.1.1.1 pkgsrc-2023Q2:1.1.1.1.0.96 pkgsrc-2023Q2-base:1.1.1.1 pkgsrc-2023Q1:1.1.1.1.0.94 pkgsrc-2023Q1-base:1.1.1.1 pkgsrc-2022Q4:1.1.1.1.0.92 pkgsrc-2022Q4-base:1.1.1.1 pkgsrc-2022Q3:1.1.1.1.0.90 pkgsrc-2022Q3-base:1.1.1.1 pkgsrc-2022Q2:1.1.1.1.0.88 pkgsrc-2022Q2-base:1.1.1.1 pkgsrc-2022Q1:1.1.1.1.0.86 pkgsrc-2022Q1-base:1.1.1.1 pkgsrc-2021Q4:1.1.1.1.0.84 pkgsrc-2021Q4-base:1.1.1.1 pkgsrc-2021Q3:1.1.1.1.0.82 pkgsrc-2021Q3-base:1.1.1.1 pkgsrc-2021Q2:1.1.1.1.0.80 pkgsrc-2021Q2-base:1.1.1.1 pkgsrc-2021Q1:1.1.1.1.0.78 pkgsrc-2021Q1-base:1.1.1.1 pkgsrc-2020Q4:1.1.1.1.0.76 pkgsrc-2020Q4-base:1.1.1.1 pkgsrc-2020Q3:1.1.1.1.0.74 pkgsrc-2020Q3-base:1.1.1.1 pkgsrc-2020Q2:1.1.1.1.0.70 pkgsrc-2020Q2-base:1.1.1.1 pkgsrc-2020Q1:1.1.1.1.0.50 pkgsrc-2020Q1-base:1.1.1.1 pkgsrc-2019Q4:1.1.1.1.0.72 pkgsrc-2019Q4-base:1.1.1.1 pkgsrc-2019Q3:1.1.1.1.0.68 pkgsrc-2019Q3-base:1.1.1.1 pkgsrc-2019Q2:1.1.1.1.0.66 pkgsrc-2019Q2-base:1.1.1.1 pkgsrc-2019Q1:1.1.1.1.0.64 pkgsrc-2019Q1-base:1.1.1.1 pkgsrc-2018Q4:1.1.1.1.0.62 pkgsrc-2018Q4-base:1.1.1.1 pkgsrc-2018Q3:1.1.1.1.0.60 pkgsrc-2018Q3-base:1.1.1.1 pkgsrc-2018Q2:1.1.1.1.0.58 pkgsrc-2018Q2-base:1.1.1.1 pkgsrc-2018Q1:1.1.1.1.0.56 pkgsrc-2018Q1-base:1.1.1.1 pkgsrc-2017Q4:1.1.1.1.0.54 pkgsrc-2017Q4-base:1.1.1.1 pkgsrc-2017Q3:1.1.1.1.0.52 pkgsrc-2017Q3-base:1.1.1.1 pkgsrc-2017Q2:1.1.1.1.0.48 pkgsrc-2017Q2-base:1.1.1.1 pkgsrc-2017Q1:1.1.1.1.0.46 pkgsrc-2017Q1-base:1.1.1.1 pkgsrc-2016Q4:1.1.1.1.0.44 pkgsrc-2016Q4-base:1.1.1.1 pkgsrc-2016Q3:1.1.1.1.0.42 pkgsrc-2016Q3-base:1.1.1.1 pkgsrc-2016Q2:1.1.1.1.0.40 pkgsrc-2016Q2-base:1.1.1.1 pkgsrc-2016Q1:1.1.1.1.0.38 pkgsrc-2016Q1-base:1.1.1.1 pkgsrc-2015Q4:1.1.1.1.0.36 pkgsrc-2015Q4-base:1.1.1.1 pkgsrc-2015Q3:1.1.1.1.0.34 pkgsrc-2015Q3-base:1.1.1.1 pkgsrc-2015Q2:1.1.1.1.0.32 pkgsrc-2015Q2-base:1.1.1.1 pkgsrc-2015Q1:1.1.1.1.0.30 pkgsrc-2015Q1-base:1.1.1.1 pkgsrc-2014Q4:1.1.1.1.0.28 pkgsrc-2014Q4-base:1.1.1.1 pkgsrc-2014Q3:1.1.1.1.0.26 pkgsrc-2014Q3-base:1.1.1.1 pkgsrc-2014Q2:1.1.1.1.0.24 pkgsrc-2014Q2-base:1.1.1.1 pkgsrc-2014Q1:1.1.1.1.0.22 pkgsrc-2014Q1-base:1.1.1.1 pkgsrc-2013Q4:1.1.1.1.0.20 pkgsrc-2013Q4-base:1.1.1.1 pkgsrc-2013Q3:1.1.1.1.0.18 pkgsrc-2013Q3-base:1.1.1.1 pkgsrc-2013Q2:1.1.1.1.0.16 pkgsrc-2013Q2-base:1.1.1.1 pkgsrc-2013Q1:1.1.1.1.0.14 pkgsrc-2013Q1-base:1.1.1.1 pkgsrc-2012Q4:1.1.1.1.0.12 pkgsrc-2012Q4-base:1.1.1.1 pkgsrc-2012Q3:1.1.1.1.0.10 pkgsrc-2012Q3-base:1.1.1.1 pkgsrc-2012Q2:1.1.1.1.0.8 pkgsrc-2012Q2-base:1.1.1.1 pkgsrc-2012Q1:1.1.1.1.0.6 pkgsrc-2012Q1-base:1.1.1.1 pkgsrc-2011Q4:1.1.1.1.0.4 pkgsrc-2011Q4-base:1.1.1.1 pkgsrc-2011Q3:1.1.1.1.0.2 pkgsrc-2011Q3-base:1.1.1.1 pkgsrc-base:1.1.1.1 TNF:1.1.1; locks; strict; comment @# @; 1.2 date 2025.10.12.02.03.10; author mrg; state Exp; branches; next 1.1; commitid 884PI1dWVGfKOdeG; 1.1 date 2011.07.27.10.23.49; author cherry; state Exp; branches 1.1.1.1; next ; 1.1.1.1 date 2011.07.27.10.23.49; author cherry; state Exp; branches; next ; desc @@ 1.2 log @minor updates needed for GCC 14. @ text @$NetBSD: patch-ak,v 1.1.1.1 2011/07/27 10:23:49 cherry Exp $ --- src/netbsd/osload-netbsd.c.orig 2025-10-11 18:33:53.082611433 -0700 +++ src/netbsd/osload-netbsd.c 2025-10-11 18:38:42.338010157 -0700 @@@@ -0,0 +1,233 @@@@ +/* + * Copyright (C) 1995-2007, Hewlett-Packard Development Company, L.P. + * + * This program 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 of the License, or + * (at your option) any later version. + * + * This program 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 this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + * + */ + +#include + +#include +#include + +#include + +#include "std.h" +#include "types.h" +#include "osload.h" +#include "state.h" +#include "fields.h" +#include "libcore.h" +#include "sim.h" +#include "simmem.h" + +extern char **environ; + +int +os_elf32_abi(char *ident, Elf32_Ehdr *ehdr, int set) +{ + /* No ILP32. */ + return (0); +} + +int +os_elf64_abi(char *ident, Elf64_Ehdr *ehdr, int set) +{ + int region; + BOOL abi; + + if (ident[EI_OSABI] != ELFOSABI_SYSV) + return (0); + + region = ehdr->e_entry >> 61; + abi = (ehdr->e_type == ET_DYN || (region > 0 && region < 5)) + ? YES : NO; + if (set) + unixABI = abi; + else if (unixABI != abi) + return (0); + + return (1); +} + +ADDR +os_rtld32_text(Elf32_Phdr *phdr) +{ + /* No ILP32. */ + return (0); +} + +ADDR +os_rtld32_data(Elf32_Phdr *phdr) +{ + /* No ILP32. */ + return (0); +} + +ADDR +os_rtld64_text(Elf64_Phdr *phdr) +{ + return (0x2000000000000000ULL); +} + +ADDR +os_rtld64_data(Elf64_Phdr *phdr) +{ + return (os_rtld64_text(phdr) + phdr->p_vaddr); +} + +/* + * Initial stack layout: + * USRSTACK +------------------------+ + * | struct ps_strings | + * PS_STRINGS +------------------------+ + * | signal trampoline code | + * +------------------------+ + * | SPARE_USRSPACE | + * +------------------------+ + * | arg & env strings | + * +------------------------+ + * | AUX entries | + * +------------------------+ + * | environ[envc + 1] | + * +------------------------+ + * | argv[argc + 1] | + * +------------------------+ + * | argc | + * SP +------------------------+ + * + * AUX entries required by rtld: + * AT_BASE + * AT_ENTRY + * AT_PHDR + * AT_PHENT + * AT_PHNUM + */ +struct ia64_ps_strings { + uint64_t ps_argvstr; /* VA of first argument string. */ + int ps_nargvstr; /* Number of argument strings. */ + int ps_pad0; + uint64_t ps_envstr; /* VA of first environment string. */ + int ps_nenvstr; /* Number of environment strings. */ + int ps_pad1; +}; + +#define AUX(sp, tag, ptr) \ + do { \ + (void)memWrt8(sp, tag); \ + (void)memWrt8(sp + 8, ptr); \ + sp += 16; \ + } while (0) + +int +os_setup_process(const char *file_name, int argc, char *argv[], + struct os_proc *proc) +{ + struct ia64_ps_strings ps_strings; + ADDR sp, strings, strp; + size_t argsz, envsz, strsz; + int envc, i; + + /* Initialize FP state (architected default value). */ + arSet(0, FPSR_ID, 0x0009804c0270033fULL); + + sp = 0xA000000000000000ULL; + sp -= 1048576; /* 1MB gateway page for EPC support. */ + setMaxSP(sp); /* =USRSTACK */ + + sp -= sizeof(ps_strings); + strings = sp; /* =PS_STRINGS */ + + /* XXX no signal trampoline code. */ + +// XXX: sp -= SPARE_USRSPACE; + + argsz = 0; + for (i = 0; i < argc; i++) + argsz += strlen(argv[i]) + 1; + envsz = 0; + for (envc = 0; environ[envc]; envc++) + envsz += strlen(environ[envc]) + 1; + sp -= (argsz + envsz + 7) & ~7; + strp = sp; + + if (proc->has_rtld) + sp -= 6 * 16; /* AUX entries */ + + sp -= (envc + 1) * 8; /* envp[] */ + ps_strings.ps_envstr = sp; + ps_strings.ps_nenvstr = envc; + sp -= (argc + 1) * 8; /* argv[] */ + ps_strings.ps_argvstr = sp; + ps_strings.ps_nargvstr = argc; + + sp -= 8; /* argc */ + + grSet(0, 32, sp); + grSet(0, 33, strings); + grSet(0, 34, 0); + + sp &= ~15; + grSet(0, SP_ID, sp - 16); + + /* Map all pages. */ + sp = page_base(sp); + do { + pmemLookup_p(sp); + sp += page_size; + } while (sp < getMaxSP()); + + /* Copy out arguments. */ + sp = ps_strings.ps_argvstr; + memWrt8(sp - 8, argc); + for (i = 0; i < argc; i++) { + strsz = strlen(argv[i]) + 1; + memBBWrt(strp, (BYTE *)argv[i], strsz); + memWrt8(sp, strp); + strp += strsz; + sp += 8; + } + memWrt8(sp, 0); + sp += 8; + + /* Copy out environment strings. */ + for (i = 0; i < envc; i++) { + strsz = strlen(environ[i]) + 1; + memBBWrt(strp, (BYTE *)environ[i], strsz); + memWrt8(sp, strp); + strp += strsz; + sp += 8; + } + memWrt8(sp, 0); + sp += 8; + + if (proc->has_rtld) { + AUX(sp, AT_BASE, proc->rtld_base); + AUX(sp, AT_ENTRY, proc->proc_entry); + AUX(sp, AT_PHDR, proc->phdr_addr); + AUX(sp, AT_PHENT, sizeof(Elf64_Phdr)); + AUX(sp, AT_PHNUM, proc->phdr_count); + AUX(sp, AT_NULL, 0); + } + + /* Copy out ps_strings. */ + memBBWrt(strings, (BYTE *)&ps_strings, sizeof(ps_strings)); + + /* Set backing store. */ + arSet(0, BSP_ID, 0x9FFFFFFF80000000ULL); + arSet(0, BSPST_ID, 0x9FFFFFFF80000000ULL); + + return (0); +} @ 1.1 log @Initial revision @ text @d1 1 a1 1 $NetBSD$ d3 2 a4 2 --- src/netbsd/osload-netbsd.c.orig 2009-12-16 12:47:32.000000000 +0000 +++ src/netbsd/osload-netbsd.c d227 1 a227 1 + AUX(sp, AT_NULL, NULL); @ 1.1.1.1 log @import wip/ski @ text @@