i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

More regs in m68k iframe.

Browse Source 
Removed DOS CR.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@22735 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2007-10-26 14:28:54 +00:00
parent d1516993c2
commit a790413138
4 changed files with 106 additions and 91 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/kernel/arch/m68k/arch_cpu.h
+17 -2
View File
@@ -12,12 +12,27 @@
#define PAGE_SIZE 4096 #define PAGE_SIZE 4096
#warning M68K: check for missing regs/movem
struct iframe { struct iframe {
uint32 d7;
/* XXX: order depends on movem */ /* XXX: order depends on movem */
uint32 d0;
uint32 d1;
uint32 d2;
uint32 d3;
uint32 d4;
uint32 d5;
uint32 d6;
uint32 d7;
uint32 a0; uint32 a0;
uint32 a1;
uint32 a2;
uint32 a3;
uint32 a4;
uint32 a5;
uint32 a6;
uint32 a7;
/* 030 ex frame: */ /* 030 ex frame: */
uint16 sr; uint16 sr; /* contains ccr */
uint32 pc; uint32 pc;
uint16 vector; /* [12:15] frame type */ uint16 vector; /* [12:15] frame type */
/* other stuff depending on frame type... do we really need that ? */ /* other stuff depending on frame type... do we really need that ? */
headers/private/kernel/arch/m68k/arch_real_time_data.h
+36 -36
View File
@@ -1,36 +1,36 @@
/* /*
* Copyright 2006, Ingo Weinhold <[email protected]>. * Copyright 2006, Ingo Weinhold <[email protected]>.
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#ifndef _KERNEL_ARCH_REAL_TIME_DATA_H #ifndef _KERNEL_ARCH_REAL_TIME_DATA_H
#define _KERNEL_ARCH_REAL_TIME_DATA_H #define _KERNEL_ARCH_REAL_TIME_DATA_H
#include <StorageDefs.h> #include <StorageDefs.h>
#include <SupportDefs.h> #include <SupportDefs.h>
#warning M68K: fix system_time()
struct ppc_real_time_data { struct m68k_real_time_data {
vint64 system_time_offset; vint64 system_time_offset;
}; };
struct arch_real_time_data { struct arch_real_time_data {
struct ppc_real_time_data data[2]; struct m68k_real_time_data data[2];
vint32 system_time_conversion_factor; vint32 system_time_conversion_factor;
vint32 version; vint32 version;
// Since there're no cheap atomic_{set,get,add}64() on PPC 32 (i.e. one // Since there're no cheap atomic_{set,get,add}64() on PPC 32 (i.e. one
// that doesn't involve a syscall), we can't have just a single // that doesn't involve a syscall), we can't have just a single
// system_time_offset and set/get it atomically. // system_time_offset and set/get it atomically.
// That's why have our data twice. One set is current (indexed by // That's why have our data twice. One set is current (indexed by
// version % 2). When setting the offset, we do that with disabled // version % 2). When setting the offset, we do that with disabled
// interrupts and protected by a spinlock. We write the new values // interrupts and protected by a spinlock. We write the new values
// into the other array element and increment the version. // into the other array element and increment the version.
// A reader first reads the version, then the date of interest, and // A reader first reads the version, then the date of interest, and
// finally rechecks the version. If it hasn't changed in the meantime, // finally rechecks the version. If it hasn't changed in the meantime,
// the read value is fine, otherwise it runs the whole procedure again. // the read value is fine, otherwise it runs the whole procedure again.
// //
// system_time_conversion_factor is currently consider constant, // system_time_conversion_factor is currently consider constant,
// although that is not necessarily true. We simply don't support // although that is not necessarily true. We simply don't support
// changing conversion factors at the moment. // changing conversion factors at the moment.
}; };
#endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */ #endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */
headers/private/kernel/arch/ppc/arch_real_time_data.h
+36 -36
View File
@@ -1,36 +1,36 @@
/* /*
* Copyright 2006, Ingo Weinhold <[email protected]>. * Copyright 2006, Ingo Weinhold <[email protected]>.
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#ifndef _KERNEL_ARCH_REAL_TIME_DATA_H #ifndef _KERNEL_ARCH_REAL_TIME_DATA_H
#define _KERNEL_ARCH_REAL_TIME_DATA_H #define _KERNEL_ARCH_REAL_TIME_DATA_H
#include <StorageDefs.h> #include <StorageDefs.h>
#include <SupportDefs.h> #include <SupportDefs.h>
struct ppc_real_time_data { struct ppc_real_time_data {
vint64 system_time_offset; vint64 system_time_offset;
}; };
struct arch_real_time_data { struct arch_real_time_data {
struct ppc_real_time_data data[2]; struct ppc_real_time_data data[2];
vint32 system_time_conversion_factor; vint32 system_time_conversion_factor;
vint32 version; vint32 version;
// Since there're no cheap atomic_{set,get,add}64() on PPC 32 (i.e. one // Since there're no cheap atomic_{set,get,add}64() on PPC 32 (i.e. one
// that doesn't involve a syscall), we can't have just a single // that doesn't involve a syscall), we can't have just a single
// system_time_offset and set/get it atomically. // system_time_offset and set/get it atomically.
// That's why have our data twice. One set is current (indexed by // That's why have our data twice. One set is current (indexed by
// version % 2). When setting the offset, we do that with disabled // version % 2). When setting the offset, we do that with disabled
// interrupts and protected by a spinlock. We write the new values // interrupts and protected by a spinlock. We write the new values
// into the other array element and increment the version. // into the other array element and increment the version.
// A reader first reads the version, then the date of interest, and // A reader first reads the version, then the date of interest, and
// finally rechecks the version. If it hasn't changed in the meantime, // finally rechecks the version. If it hasn't changed in the meantime,
// the read value is fine, otherwise it runs the whole procedure again. // the read value is fine, otherwise it runs the whole procedure again.
// //
// system_time_conversion_factor is currently consider constant, // system_time_conversion_factor is currently consider constant,
// although that is not necessarily true. We simply don't support // although that is not necessarily true. We simply don't support
// changing conversion factors at the moment. // changing conversion factors at the moment.
}; };
#endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */ #endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */
headers/private/kernel/arch/x86/arch_real_time_data.h
+17 -17
View File
@@ -1,17 +1,17 @@
/* /*
* Copyright 2006, Ingo Weinhold <[email protected]>. * Copyright 2006, Ingo Weinhold <[email protected]>.
* All rights reserved. Distributed under the terms of the MIT License. * All rights reserved. Distributed under the terms of the MIT License.
*/ */
#ifndef _KERNEL_ARCH_REAL_TIME_DATA_H #ifndef _KERNEL_ARCH_REAL_TIME_DATA_H
#define _KERNEL_ARCH_REAL_TIME_DATA_H #define _KERNEL_ARCH_REAL_TIME_DATA_H
#include <StorageDefs.h> #include <StorageDefs.h>
#include <SupportDefs.h> #include <SupportDefs.h>
struct arch_real_time_data { struct arch_real_time_data {
bigtime_t system_time_offset; bigtime_t system_time_offset;
uint32 system_time_conversion_factor; uint32 system_time_conversion_factor;
}; };
#endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */ #endif /* _KERNEL_ARCH_REAL_TIME_DATA_H */