Changeset 7

Show
Ignore:
Timestamp:
06/12/07 14:36:34 (5 years ago)
Author:
syllogism
Message:

Updated to work with recent GDC release.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/osian/kernel/boot/Multiboot.d

    r5 r7  
    154154    //convert string pointer from physical to virtual address 
    155155    char * cmdLine =  
    156         cast(char *)(mboot.commandLine - kernel.virtual_to_physical); 
     156        cast(char *)(mboot.commandLine - cast(uint)kernel.virtual_to_physical); 
    157157     
    158158    //copy command line string to 'commandLine' and convert it to dchar 
    …… 
    163163     
    164164    MemoryMap * memMap =  
    165         cast(MemoryMap *)(mboot.memoryMap - 4 - kernel.virtual_to_physical); 
     165        cast(MemoryMap *)(mboot.memoryMap - 4 - cast(uint)kernel.virtual_to_physical); 
    166166    for(i = 0;  
    167167        i < mboot.memoryMapLength;  
    …… 
    177177    //copy modules information; convert pointers to virtual 
    178178    ModuleMap * modMap =  
    179         cast(ModuleMap *)(mboot.moduleStructure - kernel.virtual_to_physical); 
     179        cast(ModuleMap *)(mboot.moduleStructure - cast(uint)kernel.virtual_to_physical); 
    180180    for(i = 0; i < mboot.numModules; i++, modMap++) 
    181181    { 
    182182      modules[modulesCount].moduleStart =  
    183           cast(void *)(modMap[i].moduleStart - kernel.virtual_to_physical);  
     183          cast(void *)(modMap[i].moduleStart - cast(uint)kernel.virtual_to_physical);  
    184184      modules[modulesCount].moduleLength =  
    185185          modMap[i].moduleEnd - modMap[i].moduleStart + 1; 
    186186      //copy argument string 
    187187      char * args =  
    188           cast(char *)(modMap.moduleArguments - kernel.virtual_to_physical); 
     188          cast(char *)(modMap.moduleArguments - cast(uint)kernel.virtual_to_physical); 
    189189      for(int j = 0;  
    190190          (modules[modulesCount].arguments[j] = cast(dchar)(args[j])) != '\0'; 
    191           j++);    
     191          j++){}    
    192192           
    193193      //make an entry in memory map for this module, too