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

Some fixed...

Browse Source 
Stack grows downward on m68k!


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@26109 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
François Revol
2008-06-23 19:43:12 +00:00
parent a474ef4c38
commit b75f915a2e
4 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/system/boot/platform/atari_m68k/atari_memory_map.h
+1
View File
@@ -23,6 +23,7 @@
/* how we will use it */ /* how we will use it */
//#define ATARI_ZBEOS_STACK_BASE 0x00040000 //#define ATARI_ZBEOS_STACK_BASE 0x00040000
#define ATARI_ZBEOS_STACK_BASE 0x00060000 #define ATARI_ZBEOS_STACK_BASE 0x00060000
#define ATARI_ZBEOS_STACK_END 0x00080000
#define ATARI_ZBEOS_BASE 0x00080000 /* from .prg shell.S will copy itself there */ #define ATARI_ZBEOS_BASE 0x00080000 /* from .prg shell.S will copy itself there */
#endif /* ATARI_MEMORY_MAP_H */ #endif /* ATARI_MEMORY_MAP_H */
src/system/boot/platform/atari_m68k/console.cpp
+2
View File
@@ -79,6 +79,8 @@ ConsoleHandle::WriteAt(void */*cookie*/, off_t /*pos*/, const void *buffer,
// be nice to our audience and replace single "\n" with "\r\n" // be nice to our audience and replace single "\n" with "\r\n"
for (i = 0; i < bufferSize; i++) { for (i = 0; i < bufferSize; i++) {
if (string[i] == '\0')
break;
if (string[i] == '\n') if (string[i] == '\n')
Bconout(fHandle, '\r'); Bconout(fHandle, '\r');
Bconout(fHandle, string[i]); Bconout(fHandle, string[i]);
src/system/boot/platform/atari_m68k/shell.S
+4 -1
View File
@@ -131,7 +131,7 @@ floppy_done:
lea h4,%a0 lea h4,%a0
bsr puts bsr puts
// setup stack // setup stack
move.l #ATARI_ZBEOS_STACK_BASE,%sp move.l #ATARI_ZBEOS_STACK_END,%sp
lea h5,%a0 lea h5,%a0
bsr puts bsr puts
move.l #0,%d0 move.l #0,%d0
@@ -226,6 +226,9 @@ prg_start:
// disable interrupts // disable interrupts
//or.w #0x0700,%sr //or.w #0x0700,%sr
// setup stack
move.l #ATARI_ZBEOS_STACK_END,%sp
lea h5,%a0 lea h5,%a0
bsr puts bsr puts
lea _bs_entry,%a0 lea _bs_entry,%a0
src/system/kernel/arch/m68k/arch_elf.cpp
+1 -1
View File
@@ -84,7 +84,7 @@ arch_elf_relocate_rel(struct elf_image_info *image, const char *sym_prepend,
struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len) struct elf_image_info *resolve_image, struct Elf32_Rel *rel, int rel_len)
#endif #endif
{ {
// there are no rel entries in PPC elf // there are no rel entries in M68K elf
return B_NO_ERROR; return B_NO_ERROR;
} }