Date: Fri, 21 Feb 2003 23:42:10 -0800 (PST) From: Serguei Tzukanov <tzukanov@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 25579 for review Message-ID: <200302220742.h1M7gAvl025297@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=25579 Change 25579 by tzukanov@tzukanov_antares on 2003/02/21 23:41:13 Compilation fixes. Affected files ... .. //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#4 edit .. //depot/projects/s390/lib/libc/s390/gen/getcontext.S#3 delete .. //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#3 edit .. //depot/projects/s390/lib/libc/s390x/gen/getcontext.S#2 delete .. //depot/projects/s390/lib/libc/s390x/sys/s390_sysinfo.c#2 edit .. //depot/projects/s390/sys/dev/md/md.c#9 edit .. //depot/projects/s390/sys/s390/s390/exception.S#2 edit .. //depot/projects/s390/sys/s390/s390/genassym.c#2 edit .. //depot/projects/s390/sys/s390/s390/trap.c#4 edit .. //depot/projects/s390/sys/s390/s390/vm_machdep.c#7 edit .. //depot/projects/s390/sys/s390x/s390x/genassym.c#2 edit Differences ... ==== //depot/projects/s390/lib/libc/s390/gen/Makefile.inc#4 (text+ko) ==== ==== //depot/projects/s390/lib/libc/s390/sys/s390_sysinfo.c#3 (text+ko) ==== @@ -9,6 +9,8 @@ #include <machine/sysarch.h> +extern int sysarch(int op, char *parms); + int s390_sysinfo(unsigned int r0, unsigned int r1, void *buf) { ==== //depot/projects/s390/lib/libc/s390x/sys/s390_sysinfo.c#2 (text+ko) ==== @@ -9,6 +9,8 @@ #include <machine/sysarch.h> +extern int sysarch(int op, char *parms); + int s390_sysinfo(unsigned int r0, unsigned int r1, void *buf) { ==== //depot/projects/s390/sys/dev/md/md.c#9 (text+ko) ==== @@ -1199,7 +1199,7 @@ md_takeroot(void *junk) { if (mdrootready) - rootdevnames[0] = "ufs:/dev/md0c"; + rootdevnames[0] = "ufs:/dev/md0"; } SYSINIT(md_root, SI_SUB_MOUNT_ROOT, SI_ORDER_FIRST, md_takeroot, NULL); ==== //depot/projects/s390/sys/s390/s390/exception.S#2 (text+ko) ==== @@ -92,8 +92,8 @@ 1: stnsm PSA_SM, 0x04 l %r1, PSA_PCPU l %r1, PC_CURTHREAD(%r1) - l %r1, TD_KSE(%r1) - tm 2 + KE_FLAGS(%r1), KEF_AP_NR + l %r0, TD_FLAGS(%r1) + n %r0, LP(td_flags) jz 2f ic %r1, PSA_SM 7: stosm PSA_SM, 0x00 @@ -111,6 +111,8 @@ l %r15, 15*4 + TF_GPR(%r15) lpsw PSA_PSW +LP_ENTRY(td_flags) + .long TDF_NEEDRESCHED | TDF_ASTPENDING LP_REF(ast) ==== //depot/projects/s390/sys/s390/s390/genassym.c#2 (text+ko) ==== @@ -27,15 +27,11 @@ #include <s390/s390/esa.h> #include <s390/s390/dat.h> -#define MK_AP_NR ((uint32_t)((KEF_NEEDRESCHED | KEF_ASTPENDING) >> 8)) -CTASSERT(MK_AP_NR < 0xff); - ASSYM(ENAMETOOLONG, ENAMETOOLONG); ASSYM(EFAULT, EFAULT); -ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); - -ASSYM(KEF_AP_NR, MK_AP_NR); +ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); +ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); ASSYM(CR0_UNUSED, CR0_UNUSED); ASSYM(CR0_SECONDARY_SPACE, CR0_SECONDARY_SPACE); @@ -87,6 +83,7 @@ ASSYM(SF_GPR6, offsetof(struct stackframe, gpr6)); ASSYM(SF_SIZEOF, sizeof(struct stackframe)); +ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); ==== //depot/projects/s390/sys/s390/s390/trap.c#4 (text+ko) ==== @@ -360,7 +360,7 @@ td = curthread; p = td->td_proc; if (usermode) { - sticks = td->td_kse->ke_sticks; + sticks = td->td_sticks; td->td_frame = tf; if (td->td_ucred != p->p_ucred) cred_update_thread(td); @@ -502,7 +502,7 @@ td = curthread; - sticks = td->td_kse->ke_sticks; + sticks = td->td_sticks; td->td_frame = tf; ==== //depot/projects/s390/sys/s390/s390/vm_machdep.c#7 (text+ko) ==== @@ -150,8 +150,6 @@ CTR2(KTR_PROC, "cpu_set_upcall: td = %p, pcb0 = %p", td, pcb0); - td->td_flags |= TDF_UPCALLING; - pcb = td->td_pcb; bcopy(pcb0, pcb, sizeof(*pcb)); @@ -166,7 +164,7 @@ } void -cpu_set_upcall_kse(struct thread *td, struct kse *ke) +cpu_set_upcall_kse(struct thread *td, struct kse_upcall *ku) { struct trapframe *tf; @@ -174,10 +172,10 @@ tf = td->td_frame; tf->tf_gpr[15] = - (int)ke->ke_stack.ss_sp + ke->ke_stack.ss_size; - psw_define_addr(&tf->tf_psw, (u_long)ke->ke_upcall); + (int)ku->ku_stack.ss_sp + ku->ku_stack.ss_size; + psw_define_addr(&tf->tf_psw, (u_long)ku->ku_func); - suword(&td->td_frame->tf_gpr[2], (u_long)ke->ke_mailbox); + suword(&td->td_frame->tf_gpr[2], (u_long)ku->ku_mailbox); } void ==== //depot/projects/s390/sys/s390x/s390x/genassym.c#2 (text+ko) ==== @@ -15,25 +15,47 @@ #include <sys/proc.h> #include <sys/ucontext.h> #include <sys/user.h> +#include <sys/mbuf.h> #include <sys/pcpu.h> - #include <vm/vm.h> #include <vm/vm_param.h> #include <vm/pmap.h> #include <vm/vm_map.h> - #include <machine/frame.h> #include <machine/sysarea.h> +#include <s390/s390/external.h> +#include <s390/s390/esa.h> +#include <s390/s390/dat.h> + +ASSYM(ENAMETOOLONG, ENAMETOOLONG); +ASSYM(EFAULT, EFAULT); + +ASSYM(TDF_ASTPENDING, TDF_ASTPENDING); +ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED); -#define MK_AP_NR ((uint32_t)((KEF_NEEDRESCHED | KEF_ASTPENDING) >> 8)) -CTASSERT(MK_AP_NR < 0xff); +ASSYM(CR0_UNUSED, CR0_UNUSED); +ASSYM(CR0_SECONDARY_SPACE, CR0_SECONDARY_SPACE); +ASSYM(CR0_ADDRESS_SPACE_FUNCTION, CR0_ADDRESS_SPACE_FUNCTION); +ASSYM(CR0_MALFUNCTION_ALERT, CR0_MALFUNCTION_ALERT); +ASSYM(CR0_EMERGENCY_SIGNAL, CR0_EMERGENCY_SIGNAL); +ASSYM(CR0_EXTERNAL_CALL, CR0_EXTERNAL_CALL); +ASSYM(CR0_SERVICE_SIGNAL, CR0_SERVICE_SIGNAL); +ASSYM(CR0_INTERRUPT_KEY, CR0_INTERRUPT_KEY); + +ASSYM(M_DATA, offsetof(struct mbuf, m_data)); +ASSYM(M_NEXT, offsetof(struct mbuf, m_next)); +ASSYM(M_LEN, offsetof(struct mbuf, m_len)); ASSYM(SA_EXTERNAL_OLD_PSW, offsetof(struct esa_sysarea, external_old_psw)); +ASSYM(SA_GPR_SAVE_AREA, offsetof(struct esa_sysarea, gpr_save_area)); ASSYM(SA_IO_OLD_PSW, offsetof(struct esa_sysarea, io_old_psw)); ASSYM(SA_MCHECK_OLD_PSW, offsetof(struct esa_sysarea, mcheck_old_psw)); ASSYM(SA_PROGRAM_OLD_PSW, offsetof(struct esa_sysarea, program_old_psw)); ASSYM(SA_SVC_OLD_PSW, offsetof(struct esa_sysarea, svc_old_psw)); +ASSYM(SACF_ACCESS_REGISTER, SACF_ACCESS_REGISTER); +ASSYM(SACF_PRIMARY_SPACE, SACF_PRIMARY_SPACE); + ASSYM(PSA_GPR15, offsetof(struct esa_sysarea, gpr15)); ASSYM(PSA_KERNEL_AR, offsetof(struct esa_sysarea, kernel_ar)); ASSYM(PSA_KSP, offsetof(struct esa_sysarea, ksp)); @@ -41,14 +63,6 @@ ASSYM(PSA_PSW, offsetof(struct esa_sysarea, psw)); ASSYM(PSA_SM, offsetof(struct esa_sysarea, sm)); ASSYM(PSA_SP_ALIGN_MASK, offsetof(struct esa_sysarea, sp_align_mask)); - -ASSYM(ENAMETOOLONG, ENAMETOOLONG); -ASSYM(EFAULT, EFAULT); - -ASSYM(KE_FLAGS, offsetof(struct kse, ke_flags)); - -ASSYM(KEF_AP_NR, MK_AP_NR); - ASSYM(PAGE_SIZE, PAGE_SIZE); ASSYM(P_VMSPACE, offsetof(struct proc, p_vmspace)); @@ -69,6 +83,7 @@ ASSYM(SF_GPR6, offsetof(struct stackframe, gpr6)); ASSYM(SF_SIZEOF, sizeof(struct stackframe)); +ASSYM(TD_FLAGS, offsetof(struct thread, td_flags)); ASSYM(TD_FRAME, offsetof(struct thread, td_frame)); ASSYM(TD_KSE, offsetof(struct thread, td_kse)); ASSYM(TD_PCB, offsetof(struct thread, td_pcb)); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200302220742.h1M7gAvl025297>