HelenOS-historicHelenOSHelenOS-doc

Català-Valencià – Catalan中文 – Chinese (Simplified)中文 – Chinese (Traditional)Česky – CzechDansk – DanishNederlands – DutchEnglish – EnglishSuomi – FinnishFrançais – FrenchDeutsch – Germanעברית – Hebrewहिंदी – HindiMagyar – HungarianBahasa Indonesia – IndonesianItaliano – Italian日本語 – Japanese한국어 – KoreanМакедонски – Macedonianमराठी – MarathiNorsk – NorwegianPolski – PolishPortuguês – PortuguesePortuguês – Portuguese (Brazil)Русский – RussianSlovenčina – SlovakSlovenščina – SlovenianEspañol – SpanishSvenska – SwedishTürkçe – TurkishУкраїнська – UkrainianOëzbekcha – Uzbek

Compare Revisions

• This comparison shows the changes necessary to convert path

  → /kernel/ @ 957

  → /kernel @ 955

  ↔ Reverse comparison

• Compare Path:	Rev

  With Path:	Rev

Ignore whitespace Rev 957 → Rev 955

/kernel/trunk/arch/ia32/include/mm/page.h
33,11 → 33,11
#define PAGE_SIZE FRAME_SIZE
#ifndef __ASM__
# define KA2PA(x) (((__address) (x)) - 0x80000000)
# define PA2KA(x) (((__address) (x)) + 0x80000000)
# define KA2PA(x) (((__address) (x)) - 0x80000000)
# define PA2KA(x) (((__address) (x)) + 0x80000000)
#else
# define KA2PA(x) ((x) - 0x80000000)
# define PA2KA(x) ((x) + 0x80000000)
# define KA2PA(x) ((x) - 0x80000000)
# define PA2KA(x) ((x) + 0x80000000)
#endif
/*

/kernel/trunk/arch/ppc32/_link.ld.in
7,13 → 7,11
*/
#define __ASM__
#include <arch/boot/boot.h>
#include <arch/mm/page.h>
ENTRY(kernel_image_start)
SECTIONS {
.image PA2KA(BOOT_OFFSET): AT (0) {
.image 0x400000: AT (0x400000) {
ktext_start = .;
*(K_TEXT_START)
*(.text);
32,7 → 30,7
hardcoded_kdata_size = .;
LONG(kdata_end - kdata_start);
hardcoded_load_address = .;
LONG(PA2KA(BOOT_OFFSET));
LONG(0x400000);
*(.bss); /* uninitialized static variables */
*(COMMON); /* global variables */

/kernel/trunk/arch/ppc32/include/boot/boot.h
File deleted

/kernel/trunk/arch/ppc32/include/mm/as.h
31,10 → 31,10
#include <arch/types.h>
#define KERNEL_ADDRESS_SPACE_START_ARCH ((__address) 0x80000000)
#define KERNEL_ADDRESS_SPACE_END_ARCH ((__address) 0xffffffff)
#define USER_ADDRESS_SPACE_START_ARCH ((__address) 0x00000000)
#define USER_ADDRESS_SPACE_END_ARCH ((__address) 0x7fffffff)
#define KERNEL_ADDRESS_SPACE_START_ARCH (__address) 0x00000000
#define KERNEL_ADDRESS_SPACE_END_ARCH (__address) 0xffffffff
#define USER_ADDRESS_SPACE_START_ARCH (__address) 0x00000000
#define USER_ADDRESS_SPACE_END_ARCH (__address) 0x7fffffff
#define USTACK_ADDRESS_ARCH (0x7fffffff-(PAGE_SIZE-1))

/kernel/trunk/arch/ppc32/include/mm/page.h
29,16 → 29,15
#ifndef __ppc32_PAGE_H__
#define __ppc32_PAGE_H__
#include <mm/page.h>
#include <arch/mm/frame.h>
#include <arch/types.h>
#define PAGE_WIDTH FRAME_WIDTH
#define PAGE_SIZE FRAME_SIZE
#ifndef __ASM__
# define KA2PA(x) (((__address) (x)) - 0x80000000)
# define PA2KA(x) (((__address) (x)) + 0x80000000)
#else
# define KA2PA(x) ((x) - 0x80000000)
# define PA2KA(x) ((x) + 0x80000000)
#endif
#define KA2PA(x) ((__address)(x))
#define PA2KA(x) ((__address)(x))
#define PTL0_ENTRIES_ARCH 0
#define PTL1_ENTRIES_ARCH 0
74,14 → 73,6
#define PTE_VALID_ARCH(p) 1
#ifndef __ASM__
#include <mm/page.h>
#include <arch/mm/frame.h>
#include <arch/types.h>
extern void page_arch_init(void);
#endif /* __ASM__ */
#endif