diff --git a/bin/disklabel/ubixfs.h b/bin/disklabel/ubixfs.h index 65c4f7f..7a0ff29 100644 --- a/bin/disklabel/ubixfs.h +++ b/bin/disklabel/ubixfs.h @@ -29,22 +29,22 @@ #include #define DOSPTYP_UBX 0x2A /* UbixFS partition type */ -#define UBIXDISKMAGIC ((uInt32)0x45) /* The disk magic number */ +#define UBIXDISKMAGIC ((uint32_t)0x45) /* The disk magic number */ #define MAXUBIXPARTITIONS 16 -#define UBIXFSMAGIC ((uInt32)0x69) /* The File System Magic Number */ +#define UBIXFSMAGIC ((uint32_t)0x69) /* The File System Magic Number */ struct ubixDiskLabel { - uInt32 magicNum; - uInt32 magicNum2; - uInt16 driveType; - uInt16 numPartitions; + uint32_t magicNum; + uint32_t magicNum2; + uint16_t driveType; + uint16_t numPartitions; struct ubixPartitions { /* the partition table */ - uInt32 p_size; /* number of sectors in partition */ - uInt32 p_offset; /* starting sector */ - uInt32 p_fsize; /* filesystem basic fragment size */ - uInt32 p_bsize; /* BAT size */ - uInt8 p_fstype; /* filesystem type, see below */ - uInt8 p_frag; /* filesystem fragments per block */ + uint32_t p_size; /* number of sectors in partition */ + uint32_t p_offset; /* starting sector */ + uint32_t p_fsize; /* filesystem basic fragment size */ + uint32_t p_bsize; /* BAT size */ + uint8_t p_fstype; /* filesystem type, see below */ + uint8_t p_frag; /* filesystem fragments per block */ } partitions[MAXUBIXPARTITIONS]; }; @@ -57,14 +57,14 @@ }; struct directoryEntry { - uInt32 startCluster; //Starting Cluster Of File - uInt32 size; //Size Of File - uInt32 creationDate; //Date Created - uInt32 lastModified; //Date Last Modified - uInt32 uid; //UID Of Owner - uInt32 gid; //GID Of Owner - uInt16 attributes; //Files Attributes - uInt16 permissions; //Files Permissions + uint32_t startCluster; //Starting Cluster Of File + uint32_t size; //Size Of File + uint32_t creationDate; //Date Created + uint32_t lastModified; //Date Last Modified + uint32_t uid; //UID Of Owner + uint32_t gid; //GID Of Owner + uint16_t attributes; //Files Attributes + uint16_t permissions; //Files Permissions char fileName[256]; //File Name }; diff --git a/bin/fdisk/main.c b/bin/fdisk/main.c index 486054d..571f1c4 100644 --- a/bin/fdisk/main.c +++ b/bin/fdisk/main.c @@ -43,8 +43,8 @@ unsigned char dp_ehd; /* end head */ unsigned char dp_esect; /* end sector */ unsigned char dp_ecyl; /* end cylinder */ - uInt32 dp_start; /* absolute starting sector number */ - uInt32 dp_size; /* partition size in sectors */ + uint32_t dp_start; /* absolute starting sector number */ + uint32_t dp_size; /* partition size in sectors */ }; int main(int argc, char **argv) { diff --git a/bin/fdisk/ubixfs.h b/bin/fdisk/ubixfs.h index 65c4f7f..7a0ff29 100644 --- a/bin/fdisk/ubixfs.h +++ b/bin/fdisk/ubixfs.h @@ -29,22 +29,22 @@ #include #define DOSPTYP_UBX 0x2A /* UbixFS partition type */ -#define UBIXDISKMAGIC ((uInt32)0x45) /* The disk magic number */ +#define UBIXDISKMAGIC ((uint32_t)0x45) /* The disk magic number */ #define MAXUBIXPARTITIONS 16 -#define UBIXFSMAGIC ((uInt32)0x69) /* The File System Magic Number */ +#define UBIXFSMAGIC ((uint32_t)0x69) /* The File System Magic Number */ struct ubixDiskLabel { - uInt32 magicNum; - uInt32 magicNum2; - uInt16 driveType; - uInt16 numPartitions; + uint32_t magicNum; + uint32_t magicNum2; + uint16_t driveType; + uint16_t numPartitions; struct ubixPartitions { /* the partition table */ - uInt32 p_size; /* number of sectors in partition */ - uInt32 p_offset; /* starting sector */ - uInt32 p_fsize; /* filesystem basic fragment size */ - uInt32 p_bsize; /* BAT size */ - uInt8 p_fstype; /* filesystem type, see below */ - uInt8 p_frag; /* filesystem fragments per block */ + uint32_t p_size; /* number of sectors in partition */ + uint32_t p_offset; /* starting sector */ + uint32_t p_fsize; /* filesystem basic fragment size */ + uint32_t p_bsize; /* BAT size */ + uint8_t p_fstype; /* filesystem type, see below */ + uint8_t p_frag; /* filesystem fragments per block */ } partitions[MAXUBIXPARTITIONS]; }; @@ -57,14 +57,14 @@ }; struct directoryEntry { - uInt32 startCluster; //Starting Cluster Of File - uInt32 size; //Size Of File - uInt32 creationDate; //Date Created - uInt32 lastModified; //Date Last Modified - uInt32 uid; //UID Of Owner - uInt32 gid; //GID Of Owner - uInt16 attributes; //Files Attributes - uInt16 permissions; //Files Permissions + uint32_t startCluster; //Starting Cluster Of File + uint32_t size; //Size Of File + uint32_t creationDate; //Date Created + uint32_t lastModified; //Date Last Modified + uint32_t uid; //UID Of Owner + uint32_t gid; //GID Of Owner + uint16_t attributes; //Files Attributes + uint16_t permissions; //Files Permissions char fileName[256]; //File Name }; diff --git a/bin/muffin/main.cc b/bin/muffin/main.cc index 9df77eb..fdbc5c3 100644 --- a/bin/muffin/main.cc +++ b/bin/muffin/main.cc @@ -46,8 +46,9 @@ window->vSDECommand(1); ogImage * image = new ogImage(); ogSurface * bgImage = new ogSurface(); -image->Load("/var/background/ringed800_600.bmp", *bgImage); -//image->Load("/var/background/sphere800x600.bmp", *bgImage); +//image->Load("/var/background/ringed800_600.bmp", *bgImage); +image->Load("/var/background/sphere800x600.bmp", *bgImage); +image->Load("/var/background/carrot2_Running.bmp", *bgImage); window->ogCopy(*bgImage); diff --git a/include_old/stddef.h b/include_old/stddef.h index a331305..104d43b 100644 --- a/include_old/stddef.h +++ b/include_old/stddef.h @@ -58,7 +58,7 @@ #ifndef __cplusplus #ifndef _WCHAR_T_DECLARED -typedef __wchar_t wchar_t; +typedef ___wchar_t wchar_t; #define _WCHAR_T_DECLARED #endif #endif diff --git a/lib/libc_old/stdlib/malloc.c b/lib/libc_old/stdlib/malloc.c index 5627b90..01c2c83 100644 --- a/lib/libc_old/stdlib/malloc.c +++ b/lib/libc_old/stdlib/malloc.c @@ -35,7 +35,7 @@ struct memDescriptor *prev; //4 struct memDescriptor *next; //4 void *baseAddr; //4 - uInt32 limit; //4 + uint32_t limit; //4 }; #define MALLOC_ALIGN_SIZE 32 @@ -87,7 +87,7 @@ /************************************************************************ - Function: void *kmalloc(uInt32 len) + Function: void *kmalloc(uint32_t len) Description: Allocate Kernel Memory Notes: @@ -95,7 +95,7 @@ 02/17/03 - Do I Still Need To Pass In The Pid? ************************************************************************/ -void *malloc( uInt32 len ) { +void *malloc( uint32_t len ) { struct memDescriptor *tmpDesc1 = 0x0; struct memDescriptor *tmpDesc2 = 0x0; char *buf = 0x0; @@ -203,7 +203,7 @@ return; } } - printf( "Kernel: Error Freeing Descriptor! [0x%X]\n", (uInt32) baseAddr ); + printf( "Kernel: Error Freeing Descriptor! [0x%X]\n", (uint32_t) baseAddr ); return; } diff --git a/lib/libc_old/sys/getdrives.c b/lib/libc_old/sys/getdrives.c index d8a36f1..994beaa 100644 --- a/lib/libc_old/sys/getdrives.c +++ b/lib/libc_old/sys/getdrives.c @@ -2,7 +2,7 @@ void *getDrives() { - uInt32 ptr = 0x0; + uint32_t ptr = 0x0; asm( "int %0\n" : : "i" (0x80),"a" (45),"b" (&ptr) diff --git a/lib/libc_old/sys/mpi.c b/lib/libc_old/sys/mpi.c index d4d835e..ccfb595 100644 --- a/lib/libc_old/sys/mpi.c +++ b/lib/libc_old/sys/mpi.c @@ -50,7 +50,7 @@ return(status); } -int mpi_postMessage_old(char *name,uInt32 type,mpi_message_t *msg) { +int mpi_postMessage_old(char *name,uint32_t type,mpi_message_t *msg) { asm volatile( "int %0\n" : : "i" (0x81),"a" (52),"b" (name),"c" (&type),"d" (msg) @@ -67,7 +67,7 @@ return(status); } -int mpi_spam(uInt32 type,void *data) { +int mpi_spam(uint32_t type,void *data) { volatile int status = 0x0; asm volatile( "int %0\n" diff --git a/lib/objgfx40/objgfx40.cpp b/lib/objgfx40/objgfx40.cpp index ae38155..5d867d0 100644 --- a/lib/objgfx40/objgfx40.cpp +++ b/lib/objgfx40/objgfx40.cpp @@ -2128,17 +2128,25 @@ ogPixCon * pc; ogPixelFmt srcPixFmt, dstPixFmt; - if (!ogAvail()) + if (!ogAvail()) { + kprintf("!ogAvail()\n"); return; - if (!src.ogAvail()) + } + if (!src.ogAvail()) { + kprintf("!src.ogAvail()\n"); return; + } - if ((dX1 > (int32) maxX) || (dY1 > (int32) maxY)) + if ((dX1 > (int32) maxX) || (dY1 > (int32) maxY)) { + kprintf("(dX1 > (int32) maxX) || (dY1 > (int32) maxY)"); return; + } // if any of the source buffer is out of bounds then do nothing - if (((uint32_t) sX1 > src.maxX) || ((uint32_t) sX2 > src.maxX) || ((uint32_t) sY1 > src.maxY) || ((uint32_t) sY2 > src.maxY)) + if (((uint32_t) sX1 > src.maxX) || ((uint32_t) sX2 > src.maxX) || ((uint32_t) sY1 > src.maxY) || ((uint32_t) sY2 > src.maxY)) { + kprintf("((uint32_t) sX1 > src.maxX) || ((uint32_t) sX2 > src.maxX) || ((uint32_t) sY1 > src.maxY) || ((uint32_t) sY2 > src.maxY)"); return; + } if (sX1 > sX2) { xx = sX1; @@ -2172,8 +2180,10 @@ dY1 = 0; } // if - if ((dX1 + xCount < 0) || (dY1 + yCount < 0)) + if ((dX1 + xCount < 0) || (dY1 + yCount < 0)) { + kprintf("(dX1 + xCount < 0) || (dY1 + yCount < 0)"); return; + } if (ogIsBlending()) { for (yy = 0; yy < yCount; yy++) @@ -2198,8 +2208,10 @@ src.ogGetPixFmt(srcPixFmt); ogGetPixFmt(dstPixFmt); pc = new ogPixCon(srcPixFmt, dstPixFmt); // allocate the pixel converter - if (pc == NULL) + if (pc == NULL) { + kprintf("pc == NULL"); return; + } for (yy = 0; yy < yCount; yy++) for (xx = 0; xx < xCount; xx++) { diff --git a/lib/objgfx40/objgfx40/objgfx40.h b/lib/objgfx40/objgfx40/objgfx40.h index 3ea08fb..ab0918e 100644 --- a/lib/objgfx40/objgfx40/objgfx40.h +++ b/lib/objgfx40/objgfx40/objgfx40.h @@ -79,7 +79,7 @@ #else protected: #endif - float version; + double version; void * buffer; ogSurface * owner; uInt32 * lineOfs; diff --git a/libexec/ld/addlibrary.c b/libexec/ld/addlibrary.c index f487356..ef58d9c 100644 --- a/libexec/ld/addlibrary.c +++ b/libexec/ld/addlibrary.c @@ -8,13 +8,13 @@ int i = 0x0; int x = 0x0; int rel = 0x0; - uInt32 *reMap = 0x0; + uint32_t *reMap = 0x0; char *newLoc = 0x0; FILE *linkerFd = 0x0; char tmpFile[1024]; ldLibrary *tmpLib = 0x0; elfDynamic *dynp = 0x0; - uInt32 *tmp = 0x0; + uint32_t *tmp = 0x0; if ((tmpLib = (ldLibrary *)malloc(sizeof(ldLibrary))) == 0x0) { printf("malloc failed: tmpLib\n"); @@ -58,17 +58,17 @@ for (i=0;ilinkerHeader->ePhnum;i++) { switch (tmpLib->linkerProgramHeader[i].phType) { case PT_LOAD: - newLoc = (char *)(tmpLib->linkerProgramHeader[i].phVaddr + (uInt32)tmpLib->output); + newLoc = (char *)(tmpLib->linkerProgramHeader[i].phVaddr + (uint32_t)tmpLib->output); fseek(linkerFd,tmpLib->linkerProgramHeader[i].phOffset,0); fread(newLoc,tmpLib->linkerProgramHeader[i].phFilesz,1,linkerFd); break; case PT_DYNAMIC: - dynp = (elfDynamic *)(tmpLib->linkerProgramHeader[i].phVaddr + (uInt32)tmpLib->output); + dynp = (elfDynamic *)(tmpLib->linkerProgramHeader[i].phVaddr + (uint32_t)tmpLib->output); printf("dynp: 0x%X:0x%X:0x%X", dynp, tmpLib->linkerProgramHeader[i].phVaddr, tmpLib->output); for (;dynp->dynVal != 0x0;dynp++) { switch (dynp->dynVal) { case DT_PLTGOT: - tmp = (void *)((uInt32)tmpLib->output + dynp->dynPtr); + tmp = (void *)((uint32_t)tmpLib->output + dynp->dynPtr); tmp[1] = 0xDEAD; tmp[2] = 0xBEEF; break; @@ -84,10 +84,10 @@ tmpLib->tlssize = tmpLib->linkerProgramHeader[i].phMemsz;//ph->p_memsz; tmpLib->tlsalign = tmpLib->linkerProgramHeader[i].phAlign;//ph->p_align; tmpLib->tlsinitsize = tmpLib->linkerProgramHeader[i].phFilesz;//ph->p_filesz; - tmpLib->tlsinit = (void*)(tmpLib->linkerProgramHeader[i].phVaddr + (uInt32)tmpLib->output); - printf("TLS: 0x%X, 0x%X, 0x%X, 0x%X", tmpLib->tlssize, tmpLib->tlsinitsize, tmpLib->tlsinit, tmpLib->tlsinit - (uInt32)tmpLib->output); + tmpLib->tlsinit = (void*)(tmpLib->linkerProgramHeader[i].phVaddr + (uint32_t)tmpLib->output); + printf("TLS: 0x%X, 0x%X, 0x%X, 0x%X", tmpLib->tlssize, tmpLib->tlsinitsize, tmpLib->tlsinit, tmpLib->tlsinit - (uint32_t)tmpLib->output); /* - newLoc = (char *)tmpLib->linkerProgramHeader[i].phVaddr + (uInt32)tmpLib->output; + newLoc = (char *)tmpLib->linkerProgramHeader[i].phVaddr + (uint32_t)tmpLib->output; fseek(linkerFd,tmpLib->linkerProgramHeader[i].phOffset,0); fread(newLoc,tmpLib->linkerProgramHeader[i].phFilesz,1,linkerFd); */ @@ -145,27 +145,27 @@ for (x=0x0;xlinkerSectionHeader[i].shSize/sizeof(elfPltInfo);x++) { rel = ELF32_R_SYM(tmpLib->linkerElfRel[x].pltInfo); - reMap = (uInt32 *)((uInt32)tmpLib->output + tmpLib->linkerElfRel[x].pltOffset); + reMap = (uint32_t *)((uint32_t)tmpLib->output + tmpLib->linkerElfRel[x].pltOffset); switch (ELF32_R_TYPE(tmpLib->linkerElfRel[x].pltInfo)) { case R_386_32: case R_386_TLS_TPOFF: case R_386_TLS_TPOFF32: case R_386_TLS_DTPMOD32: case R_386_TLS_DTPOFF32: - *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue); - *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uInt32)reMap; + *reMap += ((uint32_t)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue); + *reMap += ((uint32_t)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uint32_t)reMap; break; case R_386_PC32: - *reMap += ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uInt32)reMap; + *reMap += ((uint32_t)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue) - (uint32_t)reMap; break; case R_386_RELATIVE: - *reMap += (uInt32)tmpLib->output; + *reMap += (uint32_t)tmpLib->output; break; case R_386_JMP_SLOT: - *reMap += (uInt32)tmpLib->output; + *reMap += (uint32_t)tmpLib->output; break; case R_386_GLOB_DAT: - *reMap = ((uInt32)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue); + *reMap = ((uint32_t)tmpLib->output + tmpLib->linkerRelSymTab[rel].dynValue); break; default: printf("Unhandled sym: [0x%X]\n", ELF32_R_TYPE(tmpLib->linkerElfRel[x].pltInfo)); diff --git a/libexec/ld/elf.h b/libexec/ld/elf.h index 8d94eac..bd91a03 100644 --- a/libexec/ld/elf.h +++ b/libexec/ld/elf.h @@ -110,63 +110,63 @@ /* End Elf Program Header Types */ typedef struct { - uInt8 eIdent[16]; /* File identification. */ - uInt16 eType; /* File type. */ - uInt16 eMachine; /* Machine architecture. */ - uInt32 eVersion; /* ELF format version. */ - uInt32 eEntry; /* Entry point. */ - uInt32 ePhoff; /* Program Header file offset. */ - uInt32 eShoff; /* Section header file offset. */ - uInt32 eFlags; /* Architecture-specific flags. */ - uInt16 eEhsize; /* Size of ELF header in bytes. */ - uInt16 ePhentsize; /* Size of program header entry. */ - uInt16 ePhnum; /* Number of program header entries. */ - uInt16 eShentsize; /* Size of section header entry. */ - uInt16 eShnum; /* Number of section header entries. */ - uInt16 eShstrndx; /* Section name strings section. */ + uint8_t eIdent[16]; /* File identification. */ + uint16_t eType; /* File type. */ + uint16_t eMachine; /* Machine architecture. */ + uint32_t eVersion; /* ELF format version. */ + uint32_t eEntry; /* Entry point. */ + uint32_t ePhoff; /* Program Header file offset. */ + uint32_t eShoff; /* Section header file offset. */ + uint32_t eFlags; /* Architecture-specific flags. */ + uint16_t eEhsize; /* Size of ELF header in bytes. */ + uint16_t ePhentsize; /* Size of program header entry. */ + uint16_t ePhnum; /* Number of program header entries. */ + uint16_t eShentsize; /* Size of section header entry. */ + uint16_t eShnum; /* Number of section header entries. */ + uint16_t eShstrndx; /* Section name strings section. */ } elfHeader; typedef struct { - uInt32 phType; /* Entry type. */ - uInt32 phOffset; /* File offset of contents. */ - uInt32 phVaddr; /* Virtual address in memory image. */ - uInt32 phPaddr; /* Physical address (not used). */ - uInt32 phFilesz; /* Size of contents in file. */ - uInt32 phMemsz; /* Size of contents in memory. */ - uInt32 phFlags; /* Access permission flags. */ - uInt32 phAlign; /* Alignment in memory and file. */ + uint32_t phType; /* Entry type. */ + uint32_t phOffset; /* File offset of contents. */ + uint32_t phVaddr; /* Virtual address in memory image. */ + uint32_t phPaddr; /* Physical address (not used). */ + uint32_t phFilesz; /* Size of contents in file. */ + uint32_t phMemsz; /* Size of contents in memory. */ + uint32_t phFlags; /* Access permission flags. */ + uint32_t phAlign; /* Alignment in memory and file. */ } elfProgramHeader; typedef struct { - uInt32 shName; /* Section name (index into the section header string table). */ - uInt32 shType; /* Section type. */ - uInt32 shFlags; /* Section flags. */ - uInt32 shAddr; /* Address in memory image. */ - uInt32 shOffset; /* Offset in file. */ - uInt32 shSize; /* Size in bytes. */ - uInt32 shLink; /* Index of a related section. */ - uInt32 shInfo; /* Depends on section type. */ - uInt32 shAddralign; /* Alignment in bytes. */ - uInt32 shEntsize; /* Size of each entry in section. */ + uint32_t shName; /* Section name (index into the section header string table). */ + uint32_t shType; /* Section type. */ + uint32_t shFlags; /* Section flags. */ + uint32_t shAddr; /* Address in memory image. */ + uint32_t shOffset; /* Offset in file. */ + uint32_t shSize; /* Size in bytes. */ + uint32_t shLink; /* Index of a related section. */ + uint32_t shInfo; /* Depends on section type. */ + uint32_t shAddralign; /* Alignment in bytes. */ + uint32_t shEntsize; /* Size of each entry in section. */ } elfSectionHeader; typedef struct { - uInt32 pltOffset; - uInt32 pltInfo; + uint32_t pltOffset; + uint32_t pltInfo; } elfPltInfo; typedef struct { - uInt32 dynName; - uInt32 dynValue; - uInt32 dynSize; - uInt8 dynInfo; - uInt8 dynOther; - uInt16 dynShndx; + uint32_t dynName; + uint32_t dynValue; + uint32_t dynSize; + uint8_t dynInfo; + uint8_t dynOther; + uint16_t dynShndx; } elfDynSym; typedef struct { - uInt32 dynVal; - uInt32 dynPtr; + uint32_t dynVal; + uint32_t dynPtr; } elfDynamic; @@ -199,8 +199,8 @@ typedef struct { long d_tag; union { - uInt32 d_val; - uInt32 d_ptr; + uint32_t d_val; + uint32_t d_ptr; } d_un; } Elf32_Dyn; diff --git a/libexec/ld/findfunc.c b/libexec/ld/findfunc.c index eed92c6..34631ef 100644 --- a/libexec/ld/findfunc.c +++ b/libexec/ld/findfunc.c @@ -2,10 +2,10 @@ #include #include "ld.h" -uInt32 ldFindFunc(const char *func,const char *lib) { +uint32_t ldFindFunc(const char *func,const char *lib) { int i = 0x0; int x = 0x0; - uInt32 *funcPtr = 0x0; + uint32_t *funcPtr = 0x0; ldLibrary *libPtr = 0x0; for (x = 0; x < lib_c;x++) { @@ -16,11 +16,11 @@ for (i=0x0;ilinkerSectionHeader[libPtr->sym].shSize/sizeof(elfDynSym);i++) { if (!strcmp(func,(libPtr->linkerDynStr + libPtr->linkerRelSymTab[i].dynName))) { - funcPtr = (uInt32 *)((uInt32)(libPtr->linkerRelSymTab[i].dynValue) + (uInt32)libPtr->output); + funcPtr = (uint32_t *)((uint32_t)(libPtr->linkerRelSymTab[i].dynValue) + (uint32_t)libPtr->output); if (funcPtr == 0x0) { printf("[%s:0x%X]\n",func,funcPtr,*funcPtr); } - return((uInt32)funcPtr); + return((uint32_t)funcPtr); break; } } diff --git a/libexec/ld/ld.h b/libexec/ld/ld.h index c7b9f80..356d4c3 100644 --- a/libexec/ld/ld.h +++ b/libexec/ld/ld.h @@ -29,7 +29,7 @@ extern int lib_c; extern int lib_s[10]; -uInt32 ldFindFunc(const char *,const char *); +uint32_t ldFindFunc(const char *,const char *); ldLibrary *ldFindLibrary(const char *); ldLibrary *ldAddLibrary(const char *); diff --git a/libexec/ld/main.c b/libexec/ld/main.c index 17b7f1d..1715437 100644 --- a/libexec/ld/main.c +++ b/libexec/ld/main.c @@ -45,18 +45,18 @@ static elfPltInfo *binaryElfRelDyn = 0x0; static elfPltInfo *binaryElfRel = 0x0; -uInt32 ld( uInt32 got2, uInt32 entry ) { +uint32_t ld( uint32_t got2, uint32_t entry ) { int i = 0x0; int x = 0x0; //int y = 0x0; int rel = 0x0; int relDyn = 0x0; - uInt32 *reMap = 0x0; + uint32_t *reMap = 0x0; FILE *binaryFd = 0x0; if ( binaryHeader == 0x0 ) { binaryFd = malloc( sizeof(FILE) ); - binaryFd->fd = (uInt32) got2; + binaryFd->fd = (uint32_t) got2; fseek( binaryFd, 0x0, 0x0 ); binaryHeader = (elfHeader *) malloc( sizeof(elfHeader) ); fread( binaryHeader, sizeof(elfHeader), 1, binaryFd ); @@ -122,7 +122,7 @@ switch (ELF32_R_TYPE(binaryElfRelDyn[x].pltInfo)) { case R_386_COPY: printf("COPY"); - reMap = (uInt32 *)binaryElfRelDyn[x].pltOffset; + reMap = (uint32_t *)binaryElfRelDyn[x].pltOffset; *reMap = 0x1; break; default: @@ -142,7 +142,7 @@ i = ( entry / sizeof(elfPltInfo) ); x = ELF32_R_SYM( binaryElfRel[i].pltInfo ); - reMap = (uInt32 *) binaryElfRel[i].pltOffset; + reMap = (uint32_t *) binaryElfRel[i].pltOffset; *reMap = ldFindFunc( binaryDynStr + binaryRelSymTab[x].dynName, binaryDynStr ); printf( "\nld(%s:0x%X:0x%X)", binaryDynStr + binaryRelSymTab[x].dynName, reMap, *reMap ); //*reMap = ldFindFunc(binaryDynStr + binaryRelSymTab[x].dynName,(char *)(binaryDynStr + 1)); diff --git a/sys/sde/sde.cc b/sys/sde/sde.cc index bbc75dd..29fa33b 100644 --- a/sys/sde/sde.cc +++ b/sys/sde/sde.cc @@ -65,8 +65,14 @@ } else if (tmp == 0x0 && args->cmd != registerWindow) { if (args->cmd == drawWindow) { + kprintf("oldBuf->ogAvail(): %i\n", oldBuf->ogAvail()); + kprintf("oldBuf->ogGetBPP(): %i\n", oldBuf->ogGetBPP()); screen->ogCopyBuf(screen->ogGetMaxX() - oldBuf->ogGetMaxX(), screen->ogGetMaxY() - oldBuf->ogGetMaxY(), *oldBuf, 0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY()); kprintf("sX: %i, oX: %i, sY: %i, oY: %i", screen->ogGetMaxX(), oldBuf->ogGetMaxX(), screen->ogGetMaxY(), oldBuf->ogGetMaxY()); + oldBuf->ogLine(0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY(), 0xFFFFFFFF); + kprintf("Did ogLine\n"); + screen->ogCopyBuf(screen->ogGetMaxX() - oldBuf->ogGetMaxX(), screen->ogGetMaxY() - oldBuf->ogGetMaxY(), *oldBuf, 0, 0, oldBuf->ogGetMaxX(), oldBuf->ogGetMaxY()); + kprintf("Did another copy buf\n"); } kprintf("Invalid Window\n");