From 2ff765b6586d6d09ca27e10a17c09796624e769d Mon Sep 17 00:00:00 2001 From: Kartik Agaram Date: Wed, 23 Dec 2020 10:10:53 -0800 Subject: 7387 Redo commit 7381. There was a bug. Current state: commit 7381 excluding 7376. --- apps/boot.hex | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/apps/boot.hex b/apps/boot.hex index 74c27da0..0bf0874f 100644 --- a/apps/boot.hex +++ b/apps/boot.hex @@ -178,11 +178,11 @@ e9 fb ff # loop forever # offset 100 (address 0x7d00): # Entry: - # eax <- *0x7e04 # random address in second segment containing 'H' + # eax <- *0x7ff4 # random address in second segment containing 'H' 8b # copy rm32 to r32 05 # 00/mod/indirect 000/r32/eax 101/rm32/use-disp32 # disp32 - 04 7e 00 00 + f4 7f 00 00 # *0xb8000 <- eax 89 # copy r32 to rm32 05 # 00/mod/indirect 000/r32/eax 101/rm32/use-disp32 @@ -216,7 +216,6 @@ e9 fb ff ff ff # loop forever # not loaded on boot; loaded by load_disk # offset 200 (address 0x7e00): -00 00 00 00 48 0f 00 00 00 00 00 00 00 00 00 00 # spot the 'H' with attributes 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 @@ -248,5 +247,7 @@ e9 fb ff ff ff # loop forever 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 +00 00 00 00 48 0f 00 00 00 00 00 00 00 00 00 00 # spot the 'H' with attributes +# offset 400 (address 0x8000) # vim:ft=conf -- cgit 1.4.1-2-gfad0 2d73d8e243a408cf2930f6a7468e'>diff stats
path: root/school/contact.html
blob: 964896a557fe2495ba2ddc29e6d67caa9f9826fe (plain) (blame)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" lang="en">
	<head>
		<title>Contact Andrew Yu (School)</title>
		<link rel="stylesheet" href="/style.css" />
		<link rel="shortcut icon" href="/favicon.ico" type="image/x-icon" />
		<meta charset="utf-8" />
	</head>
	<body class="indent">
		<h1>Contact Andrew Yu (School)</h1>
		<p>
		The following ways to contact me are recommended for school-related matters.  <a href="/contact.html">Not school-related?</a>
		</p>
		<ul>
			<li>Talk to me in real life.  For those at the Songjiang Campus: I'm often in the library in my free time.  I'm usually in E104 from 21:00.</li>
			<li>Electronic mail to <code>s22537@ykpaoschool.cn</code>.</li>
			<li>Paper mail to E104.</li>
		</ul>
		<div id="footer">
			<hr />
			<p><a href="/">Andrew Yu's Website</a></p>
		</div>
	</body>
</html>