Commit graph

46 commits

Author SHA1 Message Date
Russ Cox af6a6a4775 mp: do not panic on surprising hw 2011-01-11 13:16:28 -05:00
Russ Cox 1a81e38b17 make new code like old code
Variable declarations at top of function,
separate from initialization.

Use == 0 instead of ! for checking pointers.

Consistent spacing around {, *, casts.

Declare 0-parameter functions as (void) not ().

Integer valued functions return -1 on failure, 0 on success.
2011-01-11 13:01:13 -05:00
Frans Kaashoek 40889627ba Initial version of single-cpu xv6 with page tables 2010-07-02 14:51:53 -04:00
Russ Cox 48755214c9 assorted fixes:
* rename c/cp to cpu/proc
 * rename cpu.context to cpu.scheduler
 * fix some comments
 * formatting for printout
2009-08-30 23:02:08 -07:00
rsc 2157576107 be consistent: no underscores in function names 2009-03-08 22:07:13 +00:00
rsc a6c4711a38 bda[0xE] is a 16-bit segment number,
not a real address.  So shift 4.

Reported by Silas.

Jim McKie says this code only matters
on ancient EISA MP systems.
2007-11-28 20:17:04 +00:00
rsc eb52c7de1d comments; rename irq_ to pic_ 2007-08-28 19:04:36 +00:00
rsc 5516be1fed spaces around else for rtm 2007-08-28 18:37:41 +00:00
rsc e4d6a21165 more consistent spacing 2007-08-28 18:32:08 +00:00
rsc 558ab49f13 delete unnecessary #include lines 2007-08-27 23:26:33 +00:00
rsc 99b11b6c64 Simplify MP hardware code.
Mainly delete unused constants and code.

Move mp_startthem to main.c as bootothers.
2007-08-27 22:53:31 +00:00
rsc 112873bc65 nits 2007-08-27 16:55:10 +00:00
rsc da94233784 nits 2007-08-27 16:12:08 +00:00
rsc cb30c81860 nit 2007-08-24 21:33:11 +00:00
rsc 5788b3604a nit 2006-09-08 15:15:44 +00:00
rsc 4fb684548a formatting nits 2006-09-08 15:14:43 +00:00
kaashoek 5cb7877e0f use bootstrap processor as specified by MP table. typically 0, but not
guaranteed.
2006-09-08 14:48:07 +00:00
rsc 05a7bbe08b comment fixes 2006-09-07 13:07:52 +00:00
kaashoek f70172129c run without lapic and ioapic, if they are not present
if no lapic available, use 8253pit for clock
now xv6 runs both on qemu (uniprocessor) and bochs (uniprocessor and MP)
2006-09-07 01:37:58 +00:00
rsc 0cfc7290e8 wrap long lines 2006-09-06 19:08:14 +00:00
rsc 48b824703b break single-line if statements 2006-09-06 17:57:47 +00:00
rsc f552738889 no /* */ comments 2006-09-06 17:50:20 +00:00
rsc 9e9bcaf143 standardize various * conventions 2006-09-06 17:27:19 +00:00
rsc a650c606fe spacing fixes: no tabs, 2-space indents (for rtm) 2006-09-06 17:04:06 +00:00
rtm dfcc5b997c prune unneeded panics and debug output 2006-08-29 19:06:37 +00:00
rtm 0e84a0ec6e fix race in holding() check in acquire()
give cpu1 a TSS and gdt for when it enters scheduler()
and a pseudo proc[] entry for each cpu
cpu0 waits for each other cpu to start up
read() for files
2006-08-08 19:58:06 +00:00
kaashoek c8b29f6d03 better interrupt plan---this one appears to work
ioapic
2006-08-04 18:12:31 +00:00
rtm 2927081628 uint32_t -> uint &c 2006-07-20 09:07:53 +00:00
rsc b5f17007f4 standarize on unix-like lowercase struct names 2006-07-17 01:58:13 +00:00
rsc b5ee516575 add uint and standardize on typedefs instead of unsigned 2006-07-17 01:52:13 +00:00
rsc c54c79267f nitpicks 2006-07-17 01:25:22 +00:00
rsc 6e6a1dd7d7 various little fixes that should have been in earlier checkins 2006-07-16 16:06:03 +00:00
rsc b74f4b57ae Keep interrupts disabled during startup. 2006-07-16 15:50:13 +00:00
kaashoek f27a68a24a extract lapic code from mp.c 2006-07-12 17:00:54 +00:00
rtm 8148b6ee53 i think my cmpxchg use was wrong in acquire
nesting cli/sti: release shouldn't always enable interrupts
separate setup of lapic from starting of other cpus, so cpu() works earlier
flag to disable locking in console output
make locks work even when curproc==0
(still crashes in clock interrupt)
2006-07-12 11:15:38 +00:00
rtm 4e8f237be8 no more big kernel lock
succeeds at usertests.c pipe test
2006-07-12 01:48:35 +00:00
rsc 5ce9751cab Changes to allow use of native x86 ELF compilers, which on my
Linux 2.4 box using gcc 3.4.6 don't seem to follow the same
conventions as the i386-jos-elf-gcc compilers.
Can run make 'TOOLPREFIX=' or edit the Makefile.

curproc[cpu()] can now be NULL, indicating that no proc is running.
This seemed safer to me than having curproc[0] and curproc[1]
both pointing at proc[0] potentially.

The old implementation of swtch depended on the stack frame layout
used inside swtch being okay to return from on the other stack
(exactly the V6 you are not expected to understand this).
It also could be called in two contexts: at boot time, to schedule
the very first process, and later, on behalf of a process, to sleep
or schedule some other process.

I split this into two functions: scheduler and swtch.

The scheduler is now a separate never-returning function, invoked
by each cpu once set up.  The scheduler looks like:

	scheduler() {
		setjmp(cpu.context);

		pick proc to schedule
		blah blah blah

		longjmp(proc.context)
	}

The new swtch is intended to be called only when curproc[cpu()] is not NULL,
that is, only on behalf of a user proc.  It does:

	swtch() {
		if(setjmp(proc.context) == 0)
			longjmp(cpu.context)
	}

to save the current proc context and then jump over to the scheduler,
running on the cpu stack.

Similarly the system call stubs are now in assembly in usys.S to avoid
needing to know the details of stack frame layout used by the compiler.

Also various changes in the debugging prints.
2006-07-11 01:07:40 +00:00
kaashoek b22d898297 timer interrupts
disk interrupts (assuming bochs has a bug)
2006-07-05 20:00:14 +00:00
rtm 8b4e2a08fe swtch saves callee-saved registers
swtch idles on per-CPU stack, not on calling process's stack
fix pipe bugs
usertest.c tests pipes, fork, exit, close
2006-07-01 21:26:01 +00:00
kaashoek f7cea12b38 disable interrupts when holding kernel lock 2006-06-28 16:44:41 +00:00
kaashoek bd303ed060 timer interrupts 2006-06-28 16:35:03 +00:00
kaashoek a44ee3cde8 stick mpstack in cpu structure 2006-06-26 16:40:43 +00:00
rtm 89eb5fbe6d boot more than two CPUs, each on own initial stack 2006-06-24 22:47:06 +00:00
rtm df5cc91659 compile "user programs"
curproc array
2006-06-22 20:47:23 +00:00
kaashoek 21a88fd487 checkpoint. booting second processor. stack is messed up, but thanks to cliff
and plan 9 code, at least boots and gets into C code.
2006-06-22 01:28:57 +00:00
kaashoek 7baa34a421 start on MP; detect MP configuration 2006-06-21 01:53:07 +00:00