Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update to use new definitions in alpha_cpu.h

This commit is contained in:
cgd 1996-07-11 03:46:00 +00:00
parent 436a892738
commit 4d024971bf
3 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
sys/arch/alpha/include/cpu.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: cpu.h,v 1.9 1996/07/09 00:33:20 cgd Exp $ */
/* $NetBSD: cpu.h,v 1.10 1996/07/11 03:46:00 cgd Exp $ */
/*
* Copyright (c) 1988 University of Utah.
@ -66,10 +66,10 @@ struct clockframe {
struct trapframe cf_tf;
};
#define CLKF_USERMODE(framep) \
(((framep)->cf_tf.tf_ps & ALPHA_PSL_USERMODE) != 0)
(((framep)->cf_tf.tf_af.af_ps & ALPHA_PSL_USERMODE) != 0)
#define CLKF_BASEPRI(framep) \
(((framep)->cf_tf.tf_ps & ALPHA_PSL_IPL_MASK) == 0)
#define CLKF_PC(framep) ((framep)->cf_tf.tf_pc)
(((framep)->cf_tf.tf_af.af_ps & ALPHA_PSL_IPL_MASK) == 0)
#define CLKF_PC(framep) ((framep)->cf_tf.tf_af.af_pc)
/*
* XXX No way to accurately tell if we were in interrupt mode before taking
* clock interrupt.

13
sys/arch/alpha/include/frame.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: frame.h,v 1.1 1995/02/13 23:07:39 cgd Exp $ */
/* $NetBSD: frame.h,v 1.2 1996/07/11 03:46:02 cgd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -30,9 +30,7 @@
#ifndef _ALPHA_FRAME_H_
#define _ALPHA_FRAME_H_
/*
* XXX where did this info come from?
*/
#include <machine/alpha_cpu.h>
/*
* Trap and syscall frame.
@ -78,12 +76,7 @@
struct trapframe {
u_int64_t tf_regs[FRAME_NSAVEREGS]; /* GPRs (listed above) */
u_int64_t tf_ps; /* processor status [HW] */
u_int64_t tf_pc; /* program counter [HW] */
u_int64_t tf_gp; /* global pointer [HW] */
u_int64_t tf_a0; /* saved a0 [HW] */
u_int64_t tf_a1; /* saved a1 [HW] */
u_int64_t tf_a2; /* saved a2 [HW] */
struct alpha_frame tf_af; /* hardware-defined frame */
};
#endif /* _ALPHA_FRAME_H_ */

15
sys/arch/alpha/include/pcb.h
View File

@ -1,4 +1,4 @@
/* $NetBSD: pcb.h,v 1.1 1995/02/13 23:07:43 cgd Exp $ */
/* $NetBSD: pcb.h,v 1.2 1996/07/11 03:46:04 cgd Exp $ */
/*
* Copyright (c) 1994, 1995 Carnegie-Mellon University.
@ -30,9 +30,7 @@
#include <machine/frame.h>
#include <machine/reg.h>
/*
* XXX where did this info come from?
*/
#include <machine/alpha_cpu.h>
/*
* PCB: process control block
@ -48,14 +46,7 @@
* So we cache the physical address of the pcb in the md_proc struct.
*/
struct pcb {
u_int64_t pcb_ksp; /* kernel stack ptr [HW] */
u_int64_t pcb_usp; /* user stack ptr [HW] */
u_int64_t pcb_ptbr; /* page table base reg [HW] */
u_int32_t pcb_pcc; /* process cycle cntr [HW] */
u_int32_t pcb_asn; /* address space number [HW] */
u_int64_t pcb_unique; /* process unique value [HW] */
u_int64_t pcb_fen; /* FP enable (in bit 0) [HW] */
u_int64_t pcb_decrsv[2]; /* DEC reserved [HW] */
struct alpha_pcb pcb_hw; /* PALcode defined */
u_int64_t pcb_context[9]; /* s[0-6], ra, ps [SW] */
struct fpreg pcb_fp; /* FP registers [SW] */
caddr_t pcb_onfault; /* for copy faults [SW] */