summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
Diffstat (limited to 'sys')
-rw-r--r--sys/amd64/amd64/locore.S19
-rw-r--r--sys/amd64/amd64/locore.s19
-rw-r--r--sys/i386/i386/locore.s19
-rw-r--r--sys/i386/include/asnames.h3
4 files changed, 29 insertions, 31 deletions
diff --git a/sys/amd64/amd64/locore.S b/sys/amd64/amd64/locore.S
index 4295505..e6c607c 100644
--- a/sys/amd64/amd64/locore.S
+++ b/sys/amd64/amd64/locore.S
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.117 1998/11/03 21:07:50 msmith Exp $
+ * $Id: locore.s,v 1.118 1998/12/08 10:22:31 kato Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -146,6 +146,11 @@ _vm86pa: .long 0 /* phys addr of vm86 region */
_bdb_exists: .long 0
#endif
+#ifdef PC98
+ .globl _pc98_system_parameter
+_pc98_system_parameter:
+ .space 0x240
+#endif
/**********************************************************************
*
@@ -205,16 +210,10 @@ _bdb_exists: .long 0
NON_GPROF_ENTRY(btext)
#ifdef PC98
- jmp 1f
- .globl CNAME(pc98_system_parameter)
- .org 0x400
-CNAME(pc98_system_parameter):
- .space 0x240 /* BIOS parameter block */
-1:
/* save SYSTEM PARAMETER for resume (NS/T or other) */
- movl $0xa1000,%esi
- movl $0x100000,%edi
- movl $0x0630,%ecx
+ movl $0xa1400,%esi
+ movl $R(_pc98_system_parameter),%edi
+ movl $0x0240,%ecx
cld
rep
movsb
diff --git a/sys/amd64/amd64/locore.s b/sys/amd64/amd64/locore.s
index 4295505..e6c607c 100644
--- a/sys/amd64/amd64/locore.s
+++ b/sys/amd64/amd64/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.117 1998/11/03 21:07:50 msmith Exp $
+ * $Id: locore.s,v 1.118 1998/12/08 10:22:31 kato Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -146,6 +146,11 @@ _vm86pa: .long 0 /* phys addr of vm86 region */
_bdb_exists: .long 0
#endif
+#ifdef PC98
+ .globl _pc98_system_parameter
+_pc98_system_parameter:
+ .space 0x240
+#endif
/**********************************************************************
*
@@ -205,16 +210,10 @@ _bdb_exists: .long 0
NON_GPROF_ENTRY(btext)
#ifdef PC98
- jmp 1f
- .globl CNAME(pc98_system_parameter)
- .org 0x400
-CNAME(pc98_system_parameter):
- .space 0x240 /* BIOS parameter block */
-1:
/* save SYSTEM PARAMETER for resume (NS/T or other) */
- movl $0xa1000,%esi
- movl $0x100000,%edi
- movl $0x0630,%ecx
+ movl $0xa1400,%esi
+ movl $R(_pc98_system_parameter),%edi
+ movl $0x0240,%ecx
cld
rep
movsb
diff --git a/sys/i386/i386/locore.s b/sys/i386/i386/locore.s
index 4295505..e6c607c 100644
--- a/sys/i386/i386/locore.s
+++ b/sys/i386/i386/locore.s
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* from: @(#)locore.s 7.3 (Berkeley) 5/13/91
- * $Id: locore.s,v 1.117 1998/11/03 21:07:50 msmith Exp $
+ * $Id: locore.s,v 1.118 1998/12/08 10:22:31 kato Exp $
*
* originally from: locore.s, by William F. Jolitz
*
@@ -146,6 +146,11 @@ _vm86pa: .long 0 /* phys addr of vm86 region */
_bdb_exists: .long 0
#endif
+#ifdef PC98
+ .globl _pc98_system_parameter
+_pc98_system_parameter:
+ .space 0x240
+#endif
/**********************************************************************
*
@@ -205,16 +210,10 @@ _bdb_exists: .long 0
NON_GPROF_ENTRY(btext)
#ifdef PC98
- jmp 1f
- .globl CNAME(pc98_system_parameter)
- .org 0x400
-CNAME(pc98_system_parameter):
- .space 0x240 /* BIOS parameter block */
-1:
/* save SYSTEM PARAMETER for resume (NS/T or other) */
- movl $0xa1000,%esi
- movl $0x100000,%edi
- movl $0x0630,%ecx
+ movl $0xa1400,%esi
+ movl $R(_pc98_system_parameter),%edi
+ movl $0x0240,%ecx
cld
rep
movsb
diff --git a/sys/i386/include/asnames.h b/sys/i386/include/asnames.h
index 4e04be2..90df007 100644
--- a/sys/i386/include/asnames.h
+++ b/sys/i386/include/asnames.h
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $Id: asnames.h,v 1.25 1998/09/19 17:16:48 jdp Exp $
+ * $Id: asnames.h,v 1.26 1998/10/03 17:23:25 jdp Exp $
*/
#ifndef _MACHINE_ASNAMES_H_
@@ -297,6 +297,7 @@
#define _other_cpus other_cpus
#define _ovbcopy_vector ovbcopy_vector
#define _panic panic
+#define _pc98_system_parameter pc98_system_parameter
#define _poly_div16 poly_div16
#define _poly_div2 poly_div2
#define _poly_div4 poly_div4
OpenPOWER on IntegriCloud