Module Name: src
Committed By: scole
Date: Thu May 2 16:55:51 UTC 2019
Modified Files:
src/sys/arch/ia64/ia64: genassym.cf support.S
src/sys/arch/ia64/include: setjmp.h
Log Message:
Remove some unused assembly and other variables to reduce compile warnings
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/sys/arch/ia64/ia64/genassym.cf
cvs rdiff -u -r1.8 -r1.9 src/sys/arch/ia64/ia64/support.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/ia64/include/setjmp.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/ia64/ia64/genassym.cf
diff -u src/sys/arch/ia64/ia64/genassym.cf:1.14 src/sys/arch/ia64/ia64/genassym.cf:1.15
--- src/sys/arch/ia64/ia64/genassym.cf:1.14 Tue Nov 20 20:36:24 2018
+++ src/sys/arch/ia64/ia64/genassym.cf Thu May 2 16:55:50 2019
@@ -1,4 +1,4 @@
-# $NetBSD: genassym.cf,v 1.14 2018/11/20 20:36:24 scole Exp $
+# $NetBSD: genassym.cf,v 1.15 2019/05/02 16:55:50 scole Exp $
#
# Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -63,48 +63,22 @@
# @(#)genassym.c 5.11 (Berkeley) 5/10/91
#
-if defined(_KERNEL_OPT)
-include "opt_compat_linux.h"
-include "opt_multiprocessor.h"
-endif
-
include <sys/param.h>
include <sys/proc.h>
include <sys/resourcevar.h>
include <sys/device.h>
-include <sys/mbuf.h>
include <sys/exec_elf.h>
include <sys/ucontext.h>
-include <netinet/in.h>
-include <netinet/in_systm.h>
-include <netinet/ip.h>
-include <netinet/ip6.h>
-include <netinet/ip_var.h>
-
include <uvm/uvm.h>
include <machine/pmap.h>
include <machine/vmparam.h>
include <machine/pte.h>
-include <machine/intr.h>
include <machine/frame.h>
include <machine/types.h>
include <machine/pcb.h>
-ifdef COMPAT_LINUX
-include <compat/linux/common/linux_signal.h>
-include <compat/linux/common/linux_machdep.h>
-endif
-
-ifdef COMPAT_IA32
-
-endif
-
-ifdef MULTIPROCESSOR
-include <machine/cpu.h>
-endif
-
define PAGE_SIZE PAGE_SIZE
define PAGE_SHIFT PAGE_SHIFT
define KSTACK_PAGES KSTACK_PAGES
@@ -112,7 +86,13 @@ define KSTACK_PAGES KSTACK_PAGES
define IA64_VM_MINKERN_REGION IA64_VM_MINKERN_REGION
define IA64_PBVM_RR IA64_PBVM_RR
define IA64_PBVM_PAGE_SHIFT IA64_PBVM_PAGE_SHIFT
+define IA64_PSR_I IA64_PSR_I
+define IA64_PSR_DT IA64_PSR_DT
+define IA64_PSR_DFL IA64_PSR_DFL
define IA64_PSR_DFH IA64_PSR_DFH
+define IA64_PSR_IT IA64_PSR_IT
+define IA64_PSR_RT IA64_PSR_RT
+define IA64_PSR_BN IA64_PSR_BN
define IA64_PBVM_BASE IA64_PBVM_BASE
define IA64_PBVM_PGTBL IA64_PBVM_PGTBL
define IA64_DCR_DEFAULT IA64_DCR_DEFAULT
@@ -125,61 +105,23 @@ define PTE_AR_RWX PTE_AR_RWX
define PTE_MA_WB PTE_MA_WB
define PTE_MA_UC PTE_MA_UC
-define DT_NULL DT_NULL
-define DT_RELA DT_RELA
-define DT_RELAENT DT_RELAENT
-define DT_RELASZ DT_RELASZ
-define DT_SYMTAB DT_SYMTAB
-define DT_SYMENT DT_SYMENT
-
-
-define LSRUN LSRUN
-define LSONPROC LSONPROC
-
# errno values
define ENAMETOOLONG ENAMETOOLONG
define EFAULT EFAULT
# Important offsets into the lwp and proc structs & associated constants
define L_PCB offsetof(struct lwp, l_addr)
-define L_PRIORITY offsetof(struct lwp, l_priority)
-define L_STAT offsetof(struct lwp, l_stat)
-define L_WCHAN offsetof(struct lwp, l_wchan)
-define L_PROC offsetof(struct lwp, l_proc)
-define L_CPU offsetof(struct lwp, l_cpu)
-define P_FLAG offsetof(struct proc, p_flag)
-define P_RASLIST offsetof(struct proc, p_raslist)
-
-define PK_SYSTEM PK_SYSTEM
-
-define M_DATA offsetof(struct mbuf, m_data)
-define M_LEN offsetof(struct mbuf, m_len)
-define M_NEXT offsetof(struct mbuf, m_next)
-
-define IP_SRC offsetof(struct ip, ip_src)
-define IP_DST offsetof(struct ip, ip_dst)
-
-define IP6_SRC offsetof(struct ip6_hdr, ip6_src)
-define IP6_DST offsetof(struct ip6_hdr, ip6_dst)
-
-define CI_NTRAP offsetof(struct cpu_info, ci_data.cpu_ntrap)
-define CI_NINTR offsetof(struct cpu_info, ci_data.cpu_nintr)
define SIZEOF_PCB sizeof(struct pcb)
define SIZEOF_TRAPFRAME sizeof(struct trapframe)
define SIZEOF_SPECIAL sizeof(struct _special)
-define MC_SPECIAL offsetof(struct __mcontext, mc_special)
-define UC_MCONTEXT offsetof(struct __ucontext, uc_mcontext)
-
# general constants
define VM_MAX_ADDRESS VM_MAX_ADDRESS
# Important offsets into the user struct & associated constants
define UPAGES UPAGES
-#XXX: <hack hack hack>
-
define FRAME_SYSCALL FRAME_SYSCALL
define PC_CURLWP offsetof(struct cpu_info, ci_curlwp)
Index: src/sys/arch/ia64/ia64/support.S
diff -u src/sys/arch/ia64/ia64/support.S:1.8 src/sys/arch/ia64/ia64/support.S:1.9
--- src/sys/arch/ia64/ia64/support.S:1.8 Sat Apr 6 03:06:25 2019
+++ src/sys/arch/ia64/ia64/support.S Thu May 2 16:55:50 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: support.S,v 1.8 2019/04/06 03:06:25 thorpej Exp $ */
+/* $NetBSD: support.S,v 1.9 2019/05/02 16:55:50 scole Exp $ */
/*-
* Copyright (c) 1998 Doug Rabson
@@ -56,7 +56,6 @@
*/
#include <machine/asm.h>
-#include <machine/ia64_cpu.h>
#include "assym.h"
Index: src/sys/arch/ia64/include/setjmp.h
diff -u src/sys/arch/ia64/include/setjmp.h:1.2 src/sys/arch/ia64/include/setjmp.h:1.3
--- src/sys/arch/ia64/include/setjmp.h:1.2 Sun Sep 10 21:16:56 2006
+++ src/sys/arch/ia64/include/setjmp.h Thu May 2 16:55:51 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: setjmp.h,v 1.2 2006/09/10 21:16:56 cherry Exp $ */
+/* $NetBSD: setjmp.h,v 1.3 2019/05/02 16:55:51 scole Exp $ */
/*-
* Copyright (c) 2000
@@ -44,10 +44,6 @@
#ifndef _MACHINE_SETJMP_H_
#define _MACHINE_SETJMP_H_
-#include <sys/cdefs.h>
-
-#define JMPBUF_ADDR_OF(buf, item) ((unsigned long)((char *)buf + item))
-
#define J_UNAT 0
#define J_NATS 0x8
#define J_PFS 0x10
@@ -92,10 +88,4 @@
#define _JBLEN 0x200 /* Size in long XXX: Set to sizeof(mcontext_t)/sizeof(long) */
-#ifdef _KERNEL
-#ifdef CTASSERT
-CTASSERT(sizeof(struct _jmp_buf) == 512);
-#endif
-#endif
-
#endif /* !_MACHINE_SETJMP_H_ */
