summaryrefslogtreecommitdiff
path: root/i386/intel
diff options
context:
space:
mode:
Diffstat (limited to 'i386/intel')
-rw-r--r--i386/intel/pmap.c52
-rw-r--r--i386/intel/pmap.h32
2 files changed, 42 insertions, 42 deletions
diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index 2d66bf1..fc56e87 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -83,12 +83,12 @@
#ifdef ORC
#define OLIVETTICACHE 1
-#endif ORC
+#endif /* ORC */
#ifndef OLIVETTICACHE
#define WRITE_PTE(pte_p, pte_entry) *(pte_p) = (pte_entry);
#define WRITE_PTE_FAST(pte_p, pte_entry) *(pte_p) = (pte_entry);
-#else OLIVETTICACHE
+#else /* OLIVETTICACHE */
#error might not work anymore
/* This gross kludgery is needed for Olivetti XP7 & XP9 boxes to get
@@ -125,7 +125,7 @@ pt_entry_t *pte_p, pte_entry;
#define WRITE_PTE_FAST(pte_p, pte_entry)*pte_p = pte_entry;
-#endif OLIVETTICACHE
+#endif /* OLIVETTICACHE */
/*
* Private data structures.
@@ -349,7 +349,7 @@ lock_data_t pmap_system_lock;
} \
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
#define SPLVM(spl)
#define SPLX(spl)
@@ -370,7 +370,7 @@ lock_data_t pmap_system_lock;
} \
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#define MAX_TBIS_SIZE 32 /* > this -> TBIA */ /* XXX */
@@ -380,11 +380,11 @@ lock_data_t pmap_system_lock;
flush(); \
flush_tlb(); \
}
-#else i860
+#else /* i860 */
#define INVALIDATE_TLB(s, e) { \
flush_tlb(); \
}
-#endif i860
+#endif /* i860 */
#if NCPUS > 1
@@ -415,7 +415,7 @@ typedef struct pmap_update_list *pmap_update_list_t;
struct pmap_update_list cpu_update_list[NCPUS];
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Other useful macros.
@@ -450,7 +450,7 @@ pt_entry_t *kernel_page_dir;
void pmap_remove_range(); /* forward */
#if NCPUS > 1
void signal_cpus(); /* forward */
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#if i860
/*
@@ -520,7 +520,7 @@ void ptep_check(ptep)
panic("pte count");
}
}
-#endif DEBUG_PTE_PAGE
+#endif /* DEBUG_PTE_PAGE */
/*
* Map memory at initialization. The physical addresses being
@@ -614,7 +614,7 @@ void pmap_bootstrap()
#if NCPUS > 1
lock_init(&pmap_system_lock, FALSE); /* NOT a sleep lock */
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
simple_lock_init(&kernel_pmap->lock);
@@ -852,7 +852,7 @@ void pmap_init()
simple_lock_init(&up->lock);
up->count = 0;
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Indicate that the PMAP module is now fully initialized.
@@ -1126,7 +1126,7 @@ void pmap_remove_range(pmap, va, spte, epte)
#if DEBUG_PTE_PAGE
if (pmap != kernel_pmap)
ptep_check(get_pte_page(spte));
-#endif DEBUG_PTE_PAGE
+#endif /* DEBUG_PTE_PAGE */
num_removed = 0;
num_unwired = 0;
@@ -1730,7 +1730,7 @@ Retry:
e = e->next;
}
}
-#endif DEBUG
+#endif /* DEBUG */
/*
* Add new pv_entry after header.
@@ -1888,9 +1888,9 @@ void pmap_copy(dst_pmap, src_pmap, dst_addr, len, src_addr)
{
#ifdef lint
dst_pmap++; src_pmap++; dst_addr++; len++; src_addr++;
-#endif lint
+#endif /* lint */
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_collect
@@ -2014,7 +2014,7 @@ void pmap_activate(my_pmap, th, my_cpu)
{
PMAP_ACTIVATE(my_pmap, th, my_cpu);
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_deactivate
@@ -2031,10 +2031,10 @@ void pmap_deactivate(pmap, th, which_cpu)
{
#ifdef lint
pmap++; th++; which_cpu++;
-#endif lint
+#endif /* lint */
PMAP_DEACTIVATE(pmap, th, which_cpu);
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_kernel
@@ -2046,7 +2046,7 @@ pmap_t pmap_kernel()
{
return (kernel_pmap);
}
-#endif 0
+#endif /* 0 */
/*
* pmap_zero_page zeros the specified (machine independent) page.
@@ -2065,7 +2065,7 @@ pmap_zero_page(phys)
while (i--)
zero_phys(phys++);
}
-#endif 0
+#endif /* 0 */
/*
* pmap_copy_page copies the specified (machine independent) page.
@@ -2087,7 +2087,7 @@ pmap_copy_page(src, dst)
dst += INTEL_PGBYTES;
}
}
-#endif 0
+#endif /* 0 */
/*
* Routine: pmap_pageable
@@ -2111,7 +2111,7 @@ pmap_pageable(pmap, start, end, pageable)
{
#ifdef lint
pmap++; start++; end++; pageable++;
-#endif lint
+#endif /* lint */
}
/*
@@ -2528,7 +2528,7 @@ void pmap_update_interrupt()
splx(s);
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
/*
* Dummy routine to satisfy external reference.
*/
@@ -2536,7 +2536,7 @@ void pmap_update_interrupt()
{
/* should never be called. */
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#if i860 /* akp */
void set_dirbase(dirbase)
@@ -2546,7 +2546,7 @@ void set_dirbase(dirbase)
/*flush_tlb();*/
flush_and_ctxsw(dirbase);
}
-#endif i860
+#endif /* i860 */
#ifdef i386
/* Unmap page 0 to trap NULL references. */
diff --git a/i386/intel/pmap.h b/i386/intel/pmap.h
index 6e759a6..a638f22 100644
--- a/i386/intel/pmap.h
+++ b/i386/intel/pmap.h
@@ -2,24 +2,24 @@
* Mach Operating System
* Copyright (c) 1991,1990,1989,1988 Carnegie Mellon University
* All Rights Reserved.
- *
+ *
* Permission to use, copy, modify and distribute this software and its
* documentation is hereby granted, provided that both the copyright
* notice and this permission notice appear in all copies of the
* software, derivative works or modified versions, and any portions
* thereof, and that both notices appear in supporting documentation.
- *
+ *
* CARNEGIE MELLON ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS"
* CONDITION. CARNEGIE MELLON DISCLAIMS ANY LIABILITY OF ANY KIND FOR
* ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
+ *
* Carnegie Mellon requests users of this software to return to
- *
+ *
* Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
* School of Computer Science
* Carnegie Mellon University
* Pittsburgh PA 15213-3890
- *
+ *
* any improvements or extensions that they make and grant Carnegie Mellon
* the rights to redistribute these changes.
*/
@@ -57,7 +57,7 @@
#define trunc_intel_to_vm(x) trunc_i386_to_vm(x)
#define round_intel_to_vm(x) round_i386_to_vm(x)
#define vm_to_intel(x) vm_to_i386(x)
-#endif i386
+#endif /* i386 */
#if i860
#define INTEL_PGBYTES I860_PGBYTES
#define INTEL_PGSHIFT I860_PGSHIFT
@@ -68,7 +68,7 @@
#define trunc_intel_to_vm(x) trunc_i860_to_vm(x)
#define round_intel_to_vm(x) round_i860_to_vm(x)
#define vm_to_intel(x) vm_to_i860(x)
-#endif i860
+#endif /* i860 */
/*
* i386/i486/i860 Page Table Entry
@@ -77,7 +77,7 @@
typedef unsigned int pt_entry_t;
#define PT_ENTRY_NULL ((pt_entry_t *) 0)
-#endif ASSEMBLER
+#endif /* ASSEMBLER */
#define INTEL_OFFMASK 0xfff /* offset within page */
#define PDESHIFT 22 /* page descriptor shift */
@@ -130,13 +130,13 @@ typedef unsigned int pt_entry_t;
|INTEL_PTE_REF \
|INTEL_PTE_MOD \
)
-#else NOCACHE
+#else /* NOCACHE */
#define INTEL_PTE_VALID (INTEL_PTE_valid \
|INTEL_PTE_REF \
|INTEL_PTE_MOD \
)
-#endif NOCACHE
-#endif i860
+#endif /* NOCACHE */
+#endif /* i860 */
#define pa_to_pte(a) ((a) & INTEL_PTE_PFN)
#define pte_to_pa(p) ((p) & INTEL_PTE_PFN)
@@ -199,7 +199,7 @@ void process_pmap_updates();
void pmap_update_interrupt();
extern pmap_t kernel_pmap;
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
/*
* Machine dependent routines that are used only for i386/i486/i860.
@@ -355,7 +355,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
splx(s); \
}
-#else NCPUS > 1
+#else /* NCPUS > 1 */
/*
* With only one CPU, we just have to indicate whether the pmap is
@@ -384,7 +384,7 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
(pmap)->cpus_using = FALSE; \
}
-#endif NCPUS > 1
+#endif /* NCPUS > 1 */
#define PMAP_CONTEXT(pmap, thread)
@@ -396,6 +396,6 @@ pt_entry_t *pmap_pte(pmap_t pmap, vm_offset_t addr);
#define pmap_attribute(pmap,addr,size,attr,value) \
(KERN_INVALID_ADDRESS)
-#endif ASSEMBLER
+#endif /* ASSEMBLER */
-#endif _PMAP_MACHINE_
+#endif /* _PMAP_MACHINE_ */
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-08 01:40:46 +0000