From c5f4c39fe93fcd097339dca5fca5dc20e0474da0 Mon Sep 17 00:00:00 2001 From: Amine Khaldi Date: Tue, 11 Oct 2011 18:43:34 +0000 Subject: [PATCH] [FREELDR] * Comment out some unused variables. svn path=/trunk/; revision=54083 --- reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c | 7 ++++--- reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c | 9 +++++---- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c b/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c index 6f86e3652f0..22b3c3ab006 100644 --- a/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c +++ b/reactos/boot/freeldr/freeldr/arch/powerpc/mboot.c @@ -425,7 +425,8 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern ULONG ImageSize; INT i, j; PLOADER_MODULE ModuleData; - int phsize, phnum, shsize, shnum, relsize, SectionAddr = 0; + //int phsize, phnum; + int shsize, shnum, relsize, SectionAddr = 0; PCHAR sptr; Elf32_Ehdr ehdr; Elf32_Shdr *shdr; @@ -457,8 +458,8 @@ FrLdrMapModule(FILE *KernelImage, PCHAR ImageName, PCHAR MemLoadAddr, ULONG Kern } /* Start by getting elf headers */ - phsize = ehdr.e_phentsize; - phnum = ehdr.e_phnum; + //phsize = ehdr.e_phentsize; + //phnum = ehdr.e_phnum; shsize = ehdr.e_shentsize; shnum = ehdr.e_shnum; sptr = (PCHAR)MmHeapAlloc(shnum * shsize); diff --git a/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c b/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c index 409e35204ba..b392d995b51 100644 --- a/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c +++ b/reactos/boot/freeldr/freeldr/arch/powerpc/mmu.c @@ -318,14 +318,15 @@ inline int BatTranslate( int bath, int batl, int virt ) { int PpcVirt2phys( int virt, int inst ) { int msr = GetMSR(); int txmask = inst ? 0x20 : 0x10; - int i, bath, batl, sr, sdr1, physbase, vahi, valo; - int npteg, hash, hashmask, ptehi, ptelo, ptegaddr; + int i, bath, batl, sr, sdr1, physbase, valo; + int hash, hashmask, ptehi, ptelo, ptegaddr; + //int vahi, npteg; int vsid, pteh, ptevsid, pteapi; if( msr & txmask ) { sr = GetSR( virt >> 28 ); vsid = sr & 0xfffffff; - vahi = vsid >> 4; + //vahi = vsid >> 4; valo = (vsid << 28) | (virt & 0xfffffff); if( sr & 0x80000000 ) { return valo; @@ -343,7 +344,7 @@ int PpcVirt2phys( int virt, int inst ) { physbase = sdr1 & ~0xffff; hashmask = ((sdr1 & 0x1ff) << 10) | 0x3ff; hash = (vsid & 0x7ffff) ^ ((valo >> 12) & 0xffff); - npteg = hashmask + 1; + //npteg = hashmask + 1; for( pteh = 0; pteh < 0x80; pteh += 64, hash ^= 0x7ffff ) { ptegaddr = ((hashmask & hash) * 64) + physbase;