Ros-diffs January 2007

ros-diffs@reactos.org

21 participants
401 discussions

[janderwald] 25454: - the parameter flags is of type unsigned. Therefore you dont need an additional check if Flags < 0

by janderwald＠svn.reactos.org

Author: janderwald Date: Sun Jan 14 21:07:56 2007 New Revision: 25454 URL: http://svn.reactos.org/svn/reactos?rev=25454&view=rev Log: - the parameter flags is of type unsigned. Therefore you dont need an additional check if Flags < 0 Modified: trunk/reactos/lib/rtl/unicode.c Modified: trunk/reactos/lib/rtl/unicode.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/rtl/unicode.c?rev=2545… ============================================================================== --- trunk/reactos/lib/rtl/unicode.c (original) +++ trunk/reactos/lib/rtl/unicode.c Sun Jan 14 21:07:56 2007 @@ -2105,7 +2105,7 @@ if (SourceString == NULL || DestinationString == NULL || SourceString->Length > SourceString->MaximumLength || (SourceString->Length == 0 && SourceString->MaximumLength > 0 && SourceString->Buffer == NULL) || - Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4 || Flags < 0) { + Flags == RTL_DUPLICATE_UNICODE_STRING_ALLOCATE_NULL_STRING || Flags >= 4) { return STATUS_INVALID_PARAMETER; }

17 years, 11 months

[greatlrd] 25453: the public frist version that can convert arty testms.exe that are commited to powerpc branch in the alink folder. the program doing main() ( return 0 ) fixing minior bugs as well

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 21:01:56 2007 New Revision: 25453 URL: http://svn.reactos.org/svn/reactos?rev=25453&view=rev Log: the public frist version that can convert arty testms.exe that are commited to powerpc branch in the alink folder. the program doing main() ( return 0 ) fixing minior bugs as well Added: trunk/rosapps/devutils/cputointel/ImageLoader.c Modified: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/any_op.h trunk/rosapps/devutils/cputointel/misc.c trunk/rosapps/devutils/cputointel/misc.h Modified: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (original) +++ trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c Sun Jan 14 21:01:56 2007 @@ -8,11 +8,83 @@ #include "misc.h" #include "any_op.h" -CPU_INT ConvertToIntelProcess(FILE *outfp, char *cpuid) +CPU_INT ConvertToIntelProcess(FILE *outfp, CPU_INT cpuid) { - /* cpuid we need it to known the register - we should solv it another way - */ + CPU_INT eax = 0; + CPU_INT stack = 0; + CPU_INT regbits = 0; + CPU_UNINT tmp; + pMyBrainAnalys = pStartMyBrainAnalys; + + if (cpuid == IMAGE_FILE_MACHINE_POWERPC) + { + regbits = 64 / 8; + eax = 3; /* eax = r3 */ + stack = 31 * regbits; /* r0-r31 are 64bits reg ? */ + /* exemple : + * : [ebp - 256] = r0 + * : [ebp - 248] = r1 + */ + } + else + { + printf("not supported yet\n"); + return -1; + } + + + fprintf(outfp,"BITS 32\n"); + fprintf(outfp,"GLOBAL _main\n"); + fprintf(outfp,"SECTION .text\n\n"); + fprintf(outfp,"; compile with nasm filename.asm -f win32, gcc filename.obj -o filename.exe\n\n"); + fprintf(outfp,"_main:\n"); + + /* setup a frame pointer */ + fprintf(outfp,"\n; Setup frame pointer \n"); + fprintf(outfp,"push ebp\n"); + fprintf(outfp,"mov ebp,esp\n"); + fprintf(outfp,"sub esp, %d ; Alloc %d bytes for reg\n\n",stack,stack); + + fprintf(outfp,"; Start the program \n"); + while (pMyBrainAnalys!=NULL) + { + /* fixme the line lookup from anaylysing process */ + + /* mov not full implement */ + if (pMyBrainAnalys->op == OP_ANY_mov) + { + printf("waring OP_ANY_mov are not full implement\n"); + + if ((pMyBrainAnalys->type & 8)== 8) + { + /* dst are register */ + tmp = stack - (pMyBrainAnalys->dst*regbits); + + if ((pMyBrainAnalys->type & 16)== 16) + { + /* source are imm */ + fprintf(outfp,"mov dword [ebp - %d], %llu\n", tmp, pMyBrainAnalys->src); + if (pMyBrainAnalys->dst == eax) + { + fprintf(outfp,"mov eax,[ebp - %d]\n", tmp); + } + } + } /* end pMyBrainAnalys->type & 8 */ + } + + /* return */ + if (pMyBrainAnalys->op == OP_ANY_ret) + { + if (pMyBrainAnalys->ptr_next == NULL) + { + fprintf(outfp,"\n; clean up after the frame \n"); + fprintf(outfp,"mov esp, ebp\n"); + fprintf(outfp,"pop ebp\n"); + } + fprintf(outfp,"ret\n"); + } + pMyBrainAnalys = (PMYBrainAnalys) pMyBrainAnalys->ptr_next; + } return 0; } Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sun Jan 14 21:01:56 2007 @@ -7,94 +7,96 @@ #include "any_op.h" PMYBrainAnalys pMyBrainAnalys = NULL; +PMYBrainAnalys pStartMyBrainAnalys = NULL; int main(int argc, char * argv[]) { - CPU_UNINT BaseAddress=0; - int t=0; - char *infile=NULL; - char *outfile=NULL; - char *cpuid=NULL; - CPU_INT type=0; - CPU_INT mode = 1; + //CPU_UNINT BaseAddress=0; + //int t=0; + //char *infile=NULL; + //char *outfile=NULL; + //char *cpuid=NULL; + //CPU_INT type=0; + //CPU_INT mode = 1; - printf("Usage :\n"); - printf(" need for -inbin and autodetect if it does not found a PE header \n"); - printf(" -cpu m68000 : convert motorala 68000/68008 to intel asm \n"); - printf(" -cpu m68010 : convert motorala 68010 to intel asm \n"); - printf(" -cpu m68020 : convert motorala 68020 to intel asm \n"); - printf(" -cpu m68030 : convert motorala 68030 to intel asm \n"); - printf(" -cpu m68040 : convert motorala 68040 to intel asm \n"); - printf(" -cpu ppc : convert PowerPC to intel asm \n"); - printf(" -cpu ARM4 : convert ARM4 to intel asm \n"); - printf("------------------------------------------------------------------\n"); - printf(" for -inbin and autodetect if it does not found a PE header or do\n"); - printf(" not set at all, this options are free to use \n"); - printf(".......-BaseAddress adr : the start base address only accpect \n"); - printf("....... dec value"); - printf("------------------------------------------------------------------\n"); - printf(" -in filename : try autodetect file type for you"); - printf(" whant convert\n"); - printf(" -inBin filename : the bin file you whant convert\n"); - printf(" -inExe filename : the PE file you whant convert\n"); - printf(" -OutAsm filename : the Asm file you whant create\n"); - printf(" -OutDis filename : Do disambler of the source file\n"); - printf("------------------------------------------------------------------\n"); - printf("More cpu will be added with the time or options, this is \n"); - printf("version 0.0.1 of the cpu to intel converter writen by \n"); - printf("Magnus Olsen (magnus(a)greatlord.com), it does not do anything \n"); - printf("yet, more that basic desgin how it should be writen. \n"); - printf("Copyright 2006 by Magnus Olsen, licen under GPL 2.0 for now. \n"); + //printf("Usage :\n"); + //printf(" need for -inbin and autodetect if it does not found a PE header \n"); + //printf(" -cpu m68000 : convert motorala 68000/68008 to intel asm \n"); + //printf(" -cpu m68010 : convert motorala 68010 to intel asm \n"); + //printf(" -cpu m68020 : convert motorala 68020 to intel asm \n"); + //printf(" -cpu m68030 : convert motorala 68030 to intel asm \n"); + //printf(" -cpu m68040 : convert motorala 68040 to intel asm \n"); + //printf(" -cpu ppc : convert PowerPC to intel asm \n"); + //printf(" -cpu ARM4 : convert ARM4 to intel asm \n"); + //printf("------------------------------------------------------------------\n"); + //printf(" for -inbin and autodetect if it does not found a PE header or do\n"); + //printf(" not set at all, this options are free to use \n"); + //printf(".......-BaseAddress adr : the start base address only accpect \n"); + //printf("....... dec value"); + //printf("------------------------------------------------------------------\n"); + //printf(" -in filename : try autodetect file type for you"); + //printf(" whant convert\n"); + //printf(" -inBin filename : the bin file you whant convert\n"); + //printf(" -inExe filename : the PE file you whant convert\n"); + //printf(" -OutAsm filename : the Asm file you whant create\n"); + //printf(" -OutDis filename : Do disambler of the source file\n"); + //printf("------------------------------------------------------------------\n"); + //printf("More cpu will be added with the time or options, this is \n"); + //printf("version 0.0.1 of the cpu to intel converter writen by \n"); + //printf("Magnus Olsen (magnus(a)greatlord.com), it does not do anything \n"); + //printf("yet, more that basic desgin how it should be writen. \n"); + //printf("Copyright 2006 by Magnus Olsen, licen under GPL 2.0 for now. \n"); - if (argc <4) - return 110; + //if (argc <4) + // return 110; - /* fixme better error checking for the input param */ - for (t=1; t<argc;t+=2) - { - if (stricmp(argv[t],"-in")) - { - infile = argv[t+1]; - type=0; - } + ///* fixme better error checking for the input param */ + //for (t=1; t<argc;t+=2) + //{ + // if (stricmp(argv[t],"-in")) + // { + // infile = argv[t+1]; + // type=0; + // } - if (stricmp(argv[t],"-inBin")) - { - infile = argv[t+1]; - type=1; - } + // if (stricmp(argv[t],"-inBin")) + // { + // infile = argv[t+1]; + // type=1; + // } - if (stricmp(argv[t],"-inExe")) - { - infile = argv[t+1]; - type=1; - } + // if (stricmp(argv[t],"-inExe")) + // { + // infile = argv[t+1]; + // type=1; + // } - if (stricmp(argv[t],"-OutAsm")) - { - outfile = argv[t+1]; - } - if (stricmp(argv[t],"-OutDis")) - { - outfile = argv[t+1]; - mode = 0; - } - if (stricmp(argv[t],"-BaseAddress")) - { - BaseAddress = atol(argv[t+1]); - } - if (stricmp(argv[t],"-cpu")) - { - cpuid = argv[t+1]; - } + // if (stricmp(argv[t],"-OutAsm")) + // { + // outfile = argv[t+1]; + // } + // if (stricmp(argv[t],"-OutDis")) + // { + // outfile = argv[t+1]; + // mode = 0; + // } + // if (stricmp(argv[t],"-BaseAddress")) + // { + // BaseAddress = atol(argv[t+1]); + // } + // if (stricmp(argv[t],"-cpu")) + // { + // cpuid = argv[t+1]; + // } - } + //} - return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); - //return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,0); + //return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); + //return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,0); // disambler + return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,1); // convert } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 14 21:01:56 2007 @@ -103,7 +103,7 @@ return -1; } pMyBrainAnalys->op = OP_ANY_mov; - pMyBrainAnalys->type= 1 + 8; /* 1 dst reg, 8 imm */ + pMyBrainAnalys->type= 8 + 16; /* 8 dst reg, 16 imm */ pMyBrainAnalys->src_size = 16; pMyBrainAnalys->src = formDS; pMyBrainAnalys->dst = formA; Added: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (added) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sun Jan 14 21:01:56 2007 @@ -1,0 +1,554 @@ +#include <windows.h> +#include <winnt.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "From/ARM/ARM.h" +#include "From/m68k/m68k.h" +#include "From/PPC/PPC.h" + +static CPU_INT machine_type = 0; + +/* + * infileName file name to convert or disambler + * outputfileName file name to save to + * BaseAddress the address we should emulate + * cpuid the cpu we choice not vaild for pe loader + * type the loading mode Auto, PE, bin + * mode disambler mode : 0 the arch cpu. + * translate mode : 1 intel + * + */ + +CPU_INT LoadPFileImage( char *infileName, char *outputfileName, + CPU_UNINT BaseAddress, char *cpuid, + CPU_UNINT type, CPU_INT mode) +{ + FILE *infp; + FILE *outfp; + CPU_BYTE *cpu_buffer; + CPU_UNINT cpu_pos = 0; + CPU_UNINT cpu_size=0; + CPU_INT ret; + //fopen("testms.exe","RB"); + + + /* Open file for read */ + + if (!(infp = fopen(infileName, "rb"))) + { + printf("Can not open file %s\n",infileName); + return 3; + } + + /* Open file for write */ + if (!(outfp = fopen(outputfileName,"wb"))) + { + printf("Can not open file %s\n",outputfileName); + return 4; + } + + /* Load the binary file to a memory buffer */ + fseek(infp,0,SEEK_END); + if (ferror(infp)) + { + printf("error can not seek in the read file"); + fclose(infp); + fclose(outfp); + return 5; + } + + /* get the memory size buffer */ + cpu_size = ftell(infp); + if (ferror(infp)) + { + printf("error can not get file size of the read file"); + fclose(infp); + fclose(outfp); + return 6; + } + + /* Load the binary file to a memory buffer */ + fseek(infp,0,SEEK_SET); + if (ferror(infp)) + { + printf("error can not seek in the read file"); + fclose(infp); + fclose(outfp); + return 5; + } + + if (cpu_size==0) + { + printf("error file size is Zero lenght of the read file"); + fclose(infp); + fclose(outfp); + return 7; + } + + /* alloc memory now */ + ; + if (!(cpu_buffer = (unsigned char *) malloc(cpu_size+1))) + { + printf("error can not alloc %uld size for memory buffer",cpu_size); + fclose(infp); + fclose(outfp); + return 8; + } + ZeroMemory(cpu_buffer,cpu_size); + + /* read from the file now in one sweep */ + fread((void *)cpu_buffer,1,cpu_size,infp); + if (ferror(infp)) + { + printf("error can not read file "); + fclose(infp); + fclose(outfp); + return 9; + } + fclose(infp); + + if (type==0) + { + if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode) !=0) + { + type=1; + } + else + { + if (mode > 0) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return 0; + } + } + + if (type== 1) + { + if (stricmp(cpuid,"m68000")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + } + else if (stricmp(cpuid,"m68010")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68020")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68030")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68040")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"ppc")) + { + ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"arm4")) + { + ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + } + + if (type==2) + { + + ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,machine_type); + FreeAny(); + } + fclose(outfp); + return ret; + } + + return 0; +} + +CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, + CPU_UNINT base, CPU_UNINT size, + FILE *outfp, CPU_INT mode) +{ + PIMAGE_DOS_HEADER DosHeader; + PIMAGE_NT_HEADERS NtHeader; + PIMAGE_SECTION_HEADER SectionHeader; + INT NumberOfSections; + INT NumberOfSectionsCount=0; + + DosHeader = (PIMAGE_DOS_HEADER)memory; + if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || + (size < 0x3c+2) ) + { + printf("No MZ file \n"); + return -1; + } + + NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew)); + if (NtHeader->Signature != IMAGE_NT_SIGNATURE) + { + printf("No PE header found \n"); + } + + if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) + { + printf("No execute image found \n"); + return -1; + } + + switch(NtHeader->OptionalHeader.Subsystem) + { + case IMAGE_SUBSYSTEM_EFI_APPLICATION: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_APPLICATION\n"); + printf("This exe file is desgin run in EFI bios as applactions\n"); + break; + case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER\n"); + printf("This exe file is desgin run in EFI bios as service driver\n"); + break; + case IMAGE_SUBSYSTEM_EFI_ROM: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_ROM\n"); + printf("This exe file is EFI ROM\n"); + break; + case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER\n"); + printf("This exe file is desgin run in EFI bios as driver\n"); + break; + case IMAGE_SUBSYSTEM_NATIVE: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE\n"); + printf("This exe file does not need any subsystem\n"); + break; + case IMAGE_SUBSYSTEM_NATIVE_WINDOWS: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE_WINDOWS\n"); + printf("This exe file is desgin run on Windows 9x as driver \n"); + break; + case IMAGE_SUBSYSTEM_OS2_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_OS2_CUI\n"); + printf("This exe file is desgin run on OS2 as CUI\n"); + break; + case IMAGE_SUBSYSTEM_POSIX_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_POSIX_CUI\n"); + printf("This exe file is desgin run on POSIX as CUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CE_GUI\n"); + printf("This exe file is desgin run on Windows CE as GUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_CUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CUI\n"); + printf("This exe file is desgin run on Windows as CUI\n"); + break; + case IMAGE_SUBSYSTEM_WINDOWS_GUI: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_GUI\n"); + printf("This exe file is desgin run on Windows as GUI\n"); + break; + case IMAGE_SUBSYSTEM_XBOX: + fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_XBOX\n"); + printf("This exe file is desgin run on X-Box\n"); + break; + default: + fprintf(outfp,"; OS type : Unknown\n"); + printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem); + break; + } + + /* + SectionHeader->Name == ".tls$" + SectionHeader->Name == ".tls" + SectionHeader->Name == ".text" // Executable code + SectionHeader->Name == ".sxdata" + SectionHeader->Name == ".sdata" + SectionHeader->Name == ".sbss" + SectionHeader->Name == ".rsrc" // rc data + SectionHeader->Name == ".reloc" + SectionHeader->Name == ".rdata" // read only initialized data + SectionHeader->Name == ".pdata" + SectionHeader->Name == ".idlsym" + SectionHeader->Name == ".idata" // Import tables + SectionHeader->Name == ".edata" // Export tables + SectionHeader->Name == ".drective" + SectionHeader->Name == ".debug$T" + SectionHeader->Name == ".debug$S" + SectionHeader->Name == ".debug$P" + SectionHeader->Name == ".debug$F" + SectionHeader->Name == ".data" //data segment + SectionHeader->Name == ".cormeta" + SectionHeader->Name == ".bss" // bss segment + + undoc + SectionHeader->Name == ".textbss" // bss segment + */ + + //*base = NtHeader->OptionalHeader.AddressOfEntryPoint; + + SectionHeader = IMAGE_FIRST_SECTION(NtHeader); + NumberOfSections = NtHeader->FileHeader.NumberOfSections; + + for (NumberOfSectionsCount = 0; NumberOfSectionsCount < NumberOfSections; NumberOfSectionsCount++, SectionHeader++) + { + if (strnicmp((PCHAR) SectionHeader->Name,".rsrc",5)==0) + { + /* FIXME add a rc bin to text scanner */ + } + + else if (strnicmp((PCHAR) SectionHeader->Name,".textbss",8)==0) + { + /* FIXME add a bss to text scanner */ + } + + + else if (strnicmp((PCHAR) SectionHeader->Name,".text\0",6)==0) + { + /* + FIXME we should output gas syntax + BITS 32 + GLOBAL _lrotate; + EXTERN _printf; + COMMON _commvar 4; + */ + + switch (NtHeader->FileHeader.Machine) + { + case IMAGE_FILE_MACHINE_ALPHA: + printf("CPU ALPHA Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found Alpha\n"); + machine_type = IMAGE_FILE_MACHINE_ALPHA; + return 3; + + case IMAGE_FILE_MACHINE_ALPHA64: + printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found Alpha64/AXP64\n"); + machine_type = IMAGE_FILE_MACHINE_ALPHA64; + return 3; + + case IMAGE_FILE_MACHINE_AM33: + printf("CPU AM33 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found AM33\n"); + machine_type = IMAGE_FILE_MACHINE_AM33; + return 3; + + case IMAGE_FILE_MACHINE_AMD64: + printf("CPU AMD64 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found AMD64\n"); + machine_type = IMAGE_FILE_MACHINE_AMD64; + return 3; + + case IMAGE_FILE_MACHINE_ARM: + printf("CPU ARM Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found ARM\n"); + machine_type = IMAGE_FILE_MACHINE_ARM; + return 3; + + case IMAGE_FILE_MACHINE_CEE: + printf("CPU CEE Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found CEE\n"); + machine_type = IMAGE_FILE_MACHINE_CEE; + return 3; + + case IMAGE_FILE_MACHINE_CEF: + printf("CPU CEF Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found CEF\n"); + machine_type = IMAGE_FILE_MACHINE_CEF; + return 3; + + case IMAGE_FILE_MACHINE_EBC: + printf("CPU EBC Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found EBC\n"); + machine_type = IMAGE_FILE_MACHINE_EBC; + return 3; + + case IMAGE_FILE_MACHINE_I386: + printf("CPU I386 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found I386\n"); + machine_type = IMAGE_FILE_MACHINE_I386; + return 3; + + case IMAGE_FILE_MACHINE_IA64: + printf("CPU IA64 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found IA64\n"); + machine_type = IMAGE_FILE_MACHINE_IA64; + return 3; + + case IMAGE_FILE_MACHINE_M32R: + printf("CPU M32R Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found M32R\n"); + machine_type = IMAGE_FILE_MACHINE_M32R; + return 3; + + case IMAGE_FILE_MACHINE_MIPS16: + printf("CPU MIPS16 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found MIPS16\n"); + machine_type = IMAGE_FILE_MACHINE_MIPS16; + return 3; + + case IMAGE_FILE_MACHINE_MIPSFPU: + printf("CPU MIPSFPU Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found MIPSFPU\n"); + machine_type = IMAGE_FILE_MACHINE_MIPSFPU; + return 3; + + case IMAGE_FILE_MACHINE_MIPSFPU16: + printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found MIPSFPU16\n"); + machine_type = IMAGE_FILE_MACHINE_MIPSFPU16; + return 3; + + case IMAGE_FILE_MACHINE_POWERPC: + printf("CPU POWERPC Detected partily CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found POWERPC\n"); + //PPCBrain(memory, pos, cpu_size, base, 0, outfp); + machine_type = IMAGE_FILE_MACHINE_POWERPC; + return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp,mode); + + + case IMAGE_FILE_MACHINE_POWERPCFP: + printf("CPU POWERPCFP Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found POWERPCFP\n"); + machine_type = IMAGE_FILE_MACHINE_POWERPCFP; + return 3; + + case IMAGE_FILE_MACHINE_R10000: + printf("CPU R10000 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found R10000\n"); + machine_type = IMAGE_FILE_MACHINE_R10000; + return 3; + + case IMAGE_FILE_MACHINE_R3000: + printf("CPU R3000 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found R3000\n"); + machine_type = IMAGE_FILE_MACHINE_R3000; + return 3; + + case IMAGE_FILE_MACHINE_R4000: + printf("CPU R4000 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found R4000\n"); + machine_type = IMAGE_FILE_MACHINE_R4000; + return 3; + + case IMAGE_FILE_MACHINE_SH3: + printf("CPU SH3 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found SH3\n"); + machine_type = IMAGE_FILE_MACHINE_SH3; + return 3; + + case IMAGE_FILE_MACHINE_SH3DSP: + printf("CPU SH3DSP Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found SH3DSP\n"); + machine_type = IMAGE_FILE_MACHINE_SH3DSP; + return 3; + + case IMAGE_FILE_MACHINE_SH3E: + printf("CPU SH3E Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found SH3E\n"); + machine_type = IMAGE_FILE_MACHINE_SH3E; + return 3; + + case IMAGE_FILE_MACHINE_SH4: + printf("CPU SH4 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found SH4\n"); + machine_type = IMAGE_FILE_MACHINE_SH4; + return 3; + + case IMAGE_FILE_MACHINE_SH5: + printf("CPU SH5 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found SH5\n"); + machine_type = IMAGE_FILE_MACHINE_SH5; + return 3; + + case IMAGE_FILE_MACHINE_THUMB: + printf("CPU THUMB Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found THUMB\n"); + machine_type = IMAGE_FILE_MACHINE_THUMB; + return 3; + + case IMAGE_FILE_MACHINE_TRICORE: + printf("CPU TRICORE Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found TRICORE\n"); + machine_type = IMAGE_FILE_MACHINE_TRICORE; + return 3; + + case IMAGE_FILE_MACHINE_WCEMIPSV2: + printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n"); + fprintf(outfp,"; CPU found WCEMIPSV2\n"); + machine_type = IMAGE_FILE_MACHINE_WCEMIPSV2; + return 3; + + default: + printf("Unknown Machine : %d",NtHeader->FileHeader.Machine); + return 4; + /* End case swich */ + } + /* End if .text statment */ + } + /* End for loop */ + } + + return 0; +} Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Sun Jan 14 21:01:56 2007 @@ -6,9 +6,9 @@ typedef struct _BrainAnalys { CPU_UNINT op; /* one tranlator for any cpu type set our own opcode */ - CPU_INT type; /* 0 = source are memmory, 1 source are register */ - /* 2 = dest are memmory, 4 dest are register */ - /* 8 = source are imm */ + CPU_INT type; /* 1 = source are memmory, 2 source are register */ + /* 4 = dest are memmory, 8 dest are register */ + /* 16 = source are imm */ CPU_INT src_size; /* who many bits are src not vaild for reg*/ CPU_INT dst_size; /* who many bits are dst not vaild for reg*/ @@ -23,5 +23,5 @@ CPU_BYTE* ptr_prev; /* hook previus one */ } MYBrainAnalys, *PMYBrainAnalys; -extern PMYBrainAnalys pMyBrainAnalys; - +extern PMYBrainAnalys pMyBrainAnalys; /* current working address */ +extern PMYBrainAnalys pStartMyBrainAnalys; /* start address */ Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Sun Jan 14 21:01:56 2007 @@ -140,6 +140,7 @@ return -1; } ZeroMemory(pMyBrainAnalys,sizeof(MYBrainAnalys)); + pStartMyBrainAnalys = pMyBrainAnalys; } else { @@ -149,7 +150,7 @@ { return -1; } - ZeroMemory(pMyBrainAnalys,sizeof(MYBrainAnalys)); + ZeroMemory(tmp,sizeof(MYBrainAnalys)); pMyBrainAnalys->ptr_next = (CPU_BYTE*)tmp; tmp->ptr_prev= (CPU_BYTE*)pMyBrainAnalys; Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Sun Jan 14 21:01:56 2007 @@ -26,5 +26,5 @@ CPU_INT AllocAny(); CPU_INT FreeAny(); CPU_INT AnyalsingProcess(); -CPU_INT ConvertToIntelProcess(FILE *outfp, char *cpuid); +CPU_INT ConvertToIntelProcess(FILE *outfp, CPU_INT cpuid);

17 years, 11 months

[fireball] 25452: Let's keep this branch for now...

by fireball＠svn.reactos.org

Author: fireball Date: Sun Jan 14 20:34:09 2007 New Revision: 25452 URL: http://svn.reactos.org/svn/reactos?rev=25452&view=rev Log: Let's keep this branch for now... Added: branches/ros-branch-0_3_1-old/ - copied from r25451, branches/ros-branch-0_3_1/ Removed: branches/ros-branch-0_3_1/

17 years, 11 months

[greatlrd] 25451: delete ImageLoaer.c until I time rewrite it

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 20:16:38 2007 New Revision: 25451 URL: http://svn.reactos.org/svn/reactos?rev=25451&view=rev Log: delete ImageLoaer.c until I time rewrite it Removed: trunk/rosapps/devutils/cputointel/ImageLoader.c Removed: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c (removed) @@ -1,527 +1,0 @@ -#include <windows.h> -#include <winnt.h> - -#include <stdio.h> -#include <stdlib.h> -#include <string.h> -#include "misc.h" -#include "From/ARM/ARM.h" -#include "From/m68k/m68k.h" -#include "From/PPC/PPC.h" - -/* - * infileName file name to convert or disambler - * outputfileName file name to save to - * BaseAddress the address we should emulate - * cpuid the cpu we choice not vaild for pe loader - * type the loading mode Auto, PE, bin - * mode disambler mode : 0 the arch cpu. - * translate mode : 1 intel - * - */ - -CPU_INT LoadPFileImage( char *infileName, char *outputfileName, - CPU_UNINT BaseAddress, char *cpuid, - CPU_UNINT type, CPU_INT mode) -{ - FILE *infp; - FILE *outfp; - CPU_BYTE *cpu_buffer; - CPU_UNINT cpu_pos = 0; - CPU_UNINT cpu_size=0; - CPU_INT ret; - //fopen("testms.exe","RB"); - - - /* Open file for read */ - - if (!(infp = fopen(infileName, "rb"))) - { - printf("Can not open file %s\n",infileName); - return 3; - } - - /* Open file for write */ - if (!(outfp = fopen(outputfileName,"wb"))) - { - printf("Can not open file %s\n",outputfileName); - return 4; - } - - /* Load the binary file to a memory buffer */ - fseek(infp,0,SEEK_END); - if (ferror(infp)) - { - printf("error can not seek in the read file"); - fclose(infp); - fclose(outfp); - return 5; - } - - /* get the memory size buffer */ - cpu_size = ftell(infp); - if (ferror(infp)) - { - printf("error can not get file size of the read file"); - fclose(infp); - fclose(outfp); - return 6; - } - - /* Load the binary file to a memory buffer */ - fseek(infp,0,SEEK_SET); - if (ferror(infp)) - { - printf("error can not seek in the read file"); - fclose(infp); - fclose(outfp); - return 5; - } - - if (cpu_size==0) - { - printf("error file size is Zero lenght of the read file"); - fclose(infp); - fclose(outfp); - return 7; - } - - /* alloc memory now */ - ; - if (!(cpu_buffer = (unsigned char *) malloc(cpu_size+1))) - { - printf("error can not alloc %uld size for memory buffer",cpu_size); - fclose(infp); - fclose(outfp); - return 8; - } - ZeroMemory(cpu_buffer,cpu_size); - - /* read from the file now in one sweep */ - fread((void *)cpu_buffer,1,cpu_size,infp); - if (ferror(infp)) - { - printf("error can not read file "); - fclose(infp); - fclose(outfp); - return 9; - } - fclose(infp); - - if (type==0) - { - if ( PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode) !=0) - { - type=1; - } - else - { - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return 0; - } - } - - if (type== 1) - { - if (stricmp(cpuid,"m68000")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - } - else if (stricmp(cpuid,"m68010")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68020")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68030")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68040")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"ppc")) - { - ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"arm4")) - { - ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - } - - if (type==2) - { - - ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); - if (mode > 1) - { - AnyalsingProcess(); - ConvertToIntelProcess(outfp,cpuid); - FreeAny(); - } - fclose(outfp); - return ret; - } - - return 0; -} - -CPU_INT PEFileStart( CPU_BYTE *memory, CPU_UNINT pos, - CPU_UNINT base, CPU_UNINT size, - FILE *outfp, CPU_INT mode) -{ - PIMAGE_DOS_HEADER DosHeader; - PIMAGE_NT_HEADERS NtHeader; - PIMAGE_SECTION_HEADER SectionHeader; - INT NumberOfSections; - INT NumberOfSectionsCount=0; - - DosHeader = (PIMAGE_DOS_HEADER)memory; - if ( (DosHeader->e_magic != IMAGE_DOS_SIGNATURE) || - (size < 0x3c+2) ) - { - printf("No MZ file \n"); - return -1; - } - - NtHeader = (PIMAGE_NT_HEADERS) (((ULONG)memory) + ((ULONG)DosHeader->e_lfanew)); - if (NtHeader->Signature != IMAGE_NT_SIGNATURE) - { - printf("No PE header found \n"); - } - - if (!(NtHeader->FileHeader.Characteristics & IMAGE_FILE_EXECUTABLE_IMAGE)) - { - printf("No execute image found \n"); - return -1; - } - - switch(NtHeader->OptionalHeader.Subsystem) - { - case IMAGE_SUBSYSTEM_EFI_APPLICATION: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_APPLICATION\n"); - printf("This exe file is desgin run in EFI bios as applactions\n"); - break; - case IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_BOOT_SERVICE_DRIVER\n"); - printf("This exe file is desgin run in EFI bios as service driver\n"); - break; - case IMAGE_SUBSYSTEM_EFI_ROM: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_ROM\n"); - printf("This exe file is EFI ROM\n"); - break; - case IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_EFI_RUNTIME_DRIVER\n"); - printf("This exe file is desgin run in EFI bios as driver\n"); - break; - case IMAGE_SUBSYSTEM_NATIVE: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE\n"); - printf("This exe file does not need any subsystem\n"); - break; - case IMAGE_SUBSYSTEM_NATIVE_WINDOWS: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_NATIVE_WINDOWS\n"); - printf("This exe file is desgin run on Windows 9x as driver \n"); - break; - case IMAGE_SUBSYSTEM_OS2_CUI: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_OS2_CUI\n"); - printf("This exe file is desgin run on OS2 as CUI\n"); - break; - case IMAGE_SUBSYSTEM_POSIX_CUI: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_POSIX_CUI\n"); - printf("This exe file is desgin run on POSIX as CUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_CE_GUI: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CE_GUI\n"); - printf("This exe file is desgin run on Windows CE as GUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_CUI: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_CUI\n"); - printf("This exe file is desgin run on Windows as CUI\n"); - break; - case IMAGE_SUBSYSTEM_WINDOWS_GUI: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_WINDOWS_GUI\n"); - printf("This exe file is desgin run on Windows as GUI\n"); - break; - case IMAGE_SUBSYSTEM_XBOX: - fprintf(outfp,"; OS type : IMAGE_SUBSYSTEM_XBOX\n"); - printf("This exe file is desgin run on X-Box\n"); - break; - default: - fprintf(outfp,"; OS type : Unknown\n"); - printf("Unknown OS : SubID : %d\n",NtHeader->OptionalHeader.Subsystem); - break; - } - - /* - SectionHeader->Name == ".tls$" - SectionHeader->Name == ".tls" - SectionHeader->Name == ".text" // Executable code - SectionHeader->Name == ".sxdata" - SectionHeader->Name == ".sdata" - SectionHeader->Name == ".sbss" - SectionHeader->Name == ".rsrc" // rc data - SectionHeader->Name == ".reloc" - SectionHeader->Name == ".rdata" // read only initialized data - SectionHeader->Name == ".pdata" - SectionHeader->Name == ".idlsym" - SectionHeader->Name == ".idata" // Import tables - SectionHeader->Name == ".edata" // Export tables - SectionHeader->Name == ".drective" - SectionHeader->Name == ".debug$T" - SectionHeader->Name == ".debug$S" - SectionHeader->Name == ".debug$P" - SectionHeader->Name == ".debug$F" - SectionHeader->Name == ".data" //data segment - SectionHeader->Name == ".cormeta" - SectionHeader->Name == ".bss" // bss segment - - undoc - SectionHeader->Name == ".textbss" // bss segment - */ - - //*base = NtHeader->OptionalHeader.AddressOfEntryPoint; - - SectionHeader = IMAGE_FIRST_SECTION(NtHeader); - NumberOfSections = NtHeader->FileHeader.NumberOfSections; - - for (NumberOfSectionsCount = 0; NumberOfSectionsCount < NumberOfSections; NumberOfSectionsCount++, SectionHeader++) - { - if (strnicmp((PCHAR) SectionHeader->Name,".rsrc",5)==0) - { - /* FIXME add a rc bin to text scanner */ - } - - else if (strnicmp((PCHAR) SectionHeader->Name,".textbss",8)==0) - { - /* FIXME add a bss to text scanner */ - } - - - else if (strnicmp((PCHAR) SectionHeader->Name,".text\0",6)==0) - { - /* - FIXME we should output gas syntax - BITS 32 - GLOBAL _lrotate; - EXTERN _printf; - COMMON _commvar 4; - */ - - fprintf(outfp,".SECTION .text\n"); - switch (NtHeader->FileHeader.Machine) - { - case IMAGE_FILE_MACHINE_ALPHA: - printf("CPU ALPHA Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found Alpha\n"); - return 3; - - case IMAGE_FILE_MACHINE_ALPHA64: - printf("CPU ALPHA64/AXP64 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found Alpha64/AXP64\n"); - return 3; - - case IMAGE_FILE_MACHINE_AM33: - printf("CPU AM33 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found AM33\n"); - return 3; - - case IMAGE_FILE_MACHINE_AMD64: - printf("CPU AMD64 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found AMD64\n"); - return 3; - - case IMAGE_FILE_MACHINE_ARM: - printf("CPU ARM Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found ARM\n"); - return 3; - - case IMAGE_FILE_MACHINE_CEE: - printf("CPU CEE Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found CEE\n"); - return 3; - - case IMAGE_FILE_MACHINE_CEF: - printf("CPU CEF Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found CEF\n"); - return 3; - - case IMAGE_FILE_MACHINE_EBC: - printf("CPU EBC Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found EBC\n"); - return 3; - - case IMAGE_FILE_MACHINE_I386: - printf("CPU I386 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found I386\n"); - return 3; - - case IMAGE_FILE_MACHINE_IA64: - printf("CPU IA64 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found IA64\n"); - return 3; - - case IMAGE_FILE_MACHINE_M32R: - printf("CPU M32R Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found M32R\n"); - return 3; - - case IMAGE_FILE_MACHINE_MIPS16: - printf("CPU MIPS16 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found MIPS16\n"); - return 3; - - case IMAGE_FILE_MACHINE_MIPSFPU: - printf("CPU MIPSFPU Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found MIPSFPU\n"); - return 3; - - case IMAGE_FILE_MACHINE_MIPSFPU16: - printf("CPU MIPSFPU16 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found MIPSFPU16\n"); - return 3; - - case IMAGE_FILE_MACHINE_POWERPC: - printf("CPU POWERPC Detected partily CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found POWERPC\n"); - //PPCBrain(memory, pos, cpu_size, base, 0, outfp); - return PPCBrain(memory+SectionHeader->PointerToRawData, 0, SectionHeader->SizeOfRawData, 0, 0, outfp,mode); - - return 3; - - case IMAGE_FILE_MACHINE_POWERPCFP: - printf("CPU POWERPCFP Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found POWERPCFP\n"); - return 3; - - case IMAGE_FILE_MACHINE_R10000: - printf("CPU R10000 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found R10000\n"); - return 3; - - case IMAGE_FILE_MACHINE_R3000: - printf("CPU R3000 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found R3000\n"); - return 3; - - case IMAGE_FILE_MACHINE_R4000: - printf("CPU R4000 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found R4000\n"); - return 3; - - case IMAGE_FILE_MACHINE_SH3: - printf("CPU SH3 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found SH3\n"); - return 3; - - case IMAGE_FILE_MACHINE_SH3DSP: - printf("CPU SH3DSP Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found SH3DSP\n"); - return 3; - - case IMAGE_FILE_MACHINE_SH3E: - printf("CPU SH3E Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found SH3E\n"); - return 3; - - case IMAGE_FILE_MACHINE_SH4: - printf("CPU SH4 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found SH4\n"); - return 3; - - case IMAGE_FILE_MACHINE_SH5: - printf("CPU SH5 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found SH5\n"); - return 3; - - case IMAGE_FILE_MACHINE_THUMB: - printf("CPU THUMB Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found THUMB\n"); - return 3; - - case IMAGE_FILE_MACHINE_TRICORE: - printf("CPU TRICORE Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found TRICORE\n"); - return 3; - - case IMAGE_FILE_MACHINE_WCEMIPSV2: - printf("CPU WCEMIPSV2 Detected no CPUBrain implement for it\n"); - fprintf(outfp,"; CPU found WCEMIPSV2\n"); - return 3; - - default: - printf("Unknown Machine : %d",NtHeader->FileHeader.Machine); - return 4; - /* End case swich */ - } - /* End if .text statment */ - } - /* End for loop */ - } - - return 0; -}

17 years, 11 months

[spetreolle] 25450: fix warnings

by spetreolle＠svn.reactos.org

Author: spetreolle Date: Sun Jan 14 18:21:35 2007 New Revision: 25450 URL: http://svn.reactos.org/svn/reactos?rev=25450&view=rev Log: fix warnings Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sun Jan 14 18:21:35 2007 @@ -351,18 +351,18 @@ for (NumberOfSectionsCount = 0; NumberOfSectionsCount < NumberOfSections; NumberOfSectionsCount++, SectionHeader++) { - if (strnicmp(SectionHeader->Name,".rsrc",5)==0) + if (strnicmp((PCHAR) SectionHeader->Name,".rsrc",5)==0) { /* FIXME add a rc bin to text scanner */ } - else if (strnicmp(SectionHeader->Name,".textbss",8)==0) + else if (strnicmp((PCHAR) SectionHeader->Name,".textbss",8)==0) { /* FIXME add a bss to text scanner */ } - else if (strnicmp(SectionHeader->Name,".text\0",6)==0) + else if (strnicmp((PCHAR) SectionHeader->Name,".text\0",6)==0) { /* FIXME we should output gas syntax

17 years, 11 months

[greatlrd] 25449: Adding stub for AnyalsingProcess and ConvertToIntelProcess

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 16:54:19 2007 New Revision: 25449 URL: http://svn.reactos.org/svn/reactos?rev=25449&view=rev Log: Adding stub for AnyalsingProcess and ConvertToIntelProcess Added: trunk/rosapps/devutils/cputointel/AnyalsingProcess.c (with props) trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (with props) Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/cputointel.rbuild trunk/rosapps/devutils/cputointel/misc.h Added: trunk/rosapps/devutils/cputointel/AnyalsingProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Anyals… ============================================================================== --- trunk/rosapps/devutils/cputointel/AnyalsingProcess.c (added) +++ trunk/rosapps/devutils/cputointel/AnyalsingProcess.c Sun Jan 14 16:54:19 2007 @@ -1,0 +1,17 @@ +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "any_op.h" + + +CPU_INT AnyalsingProcess() +{ + /* FIXME it will set a name to the memory if we got one */ + + /* FIXME build the jump table */ + + return 0; +} + + Propchange: trunk/rosapps/devutils/cputointel/AnyalsingProcess.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/Conver… ============================================================================== --- trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c (added) +++ trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c Sun Jan 14 16:54:19 2007 @@ -1,0 +1,18 @@ + +#include <windows.h> +#include <winnt.h> + +#include <stdio.h> +#include <stdlib.h> +#include <string.h> +#include "misc.h" +#include "any_op.h" + +CPU_INT ConvertToIntelProcess(FILE *outfp, char *cpuid) +{ + /* cpuid we need it to known the register + we should solv it another way + */ + + return 0; +} Propchange: trunk/rosapps/devutils/cputointel/ConvertToIntelProcess.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Sun Jan 14 16:54:19 2007 @@ -51,20 +51,6 @@ CPU_INT cpuint; CPU_INT retcode = 0; CPU_INT retsize; - - - /* 0x12 = 0001 0010, - 0x10 = 0001 0000 - 0x13 = 0001 0011 - - 0x20 = 0010 0000 0 0000 0010 2 - 0x80 = 1000 0000 0 0000 1000 8 - 0x4e = 0010 1110 E 1110 0010 2 - - 0x20 00 80 4e - 0010 0000 0000 0000 1000 0000 0100 1110 - - */ /* now we start the process */ while (cpu_pos<cpu_size) Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sun Jan 14 16:54:19 2007 @@ -114,9 +114,17 @@ { type=1; } - FreeAny(); - fclose(outfp); - return 0; + else + { + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return 0; + } } if (type== 1) @@ -124,58 +132,98 @@ if (stricmp(cpuid,"m68000")) { ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + } + else if (stricmp(cpuid,"m68010")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68020")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68030")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"m68040")) + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"ppc")) + { + ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + else if (stricmp(cpuid,"arm4")) + { + ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); + FreeAny(); + } + fclose(outfp); + return ret; + } + } + + if (type==2) + { + + ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); + if (mode > 1) + { + AnyalsingProcess(); + ConvertToIntelProcess(outfp,cpuid); FreeAny(); - fclose(outfp); - } - else if (stricmp(cpuid,"m68010")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68020")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68030")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"m68040")) - { - ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"ppc")) - { - ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - else if (stricmp(cpuid,"arm4")) - { - ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); - FreeAny(); - fclose(outfp); - return ret; - } - } - - if (type==2) - { - - ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); - FreeAny(); + } fclose(outfp); return ret; } Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (original) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Sun Jan 14 16:54:19 2007 @@ -6,6 +6,8 @@ <library>kernel32</library> <library>user32</library> + <file>AnyalsingProcess.c</file> + <file>ConvertToIntelProcess.c</file> <file>CpuToIntel.c</file> <file>ImageLoader.c</file> <file>misc.c</file> Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Sun Jan 14 16:54:19 2007 @@ -25,3 +25,6 @@ CPU_INT AllocAny(); CPU_INT FreeAny(); +CPU_INT AnyalsingProcess(); +CPU_INT ConvertToIntelProcess(FILE *outfp, char *cpuid); +

17 years, 11 months

[greatlrd] 25448: adding blr opcode (can not found it in the ibm or motorala doc, the primary opcode refens to addi). now we can disambler two opcode the li and blr, add blr to my own asm langues.

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 15:10:53 2007 New Revision: 25448 URL: http://svn.reactos.org/svn/reactos?rev=25448&view=rev Log: adding blr opcode (can not found it in the ibm or motorala doc, the primary opcode refens to addi). now we can disambler two opcode the li and blr, add blr to my own asm langues. Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/any_op.h trunk/rosapps/devutils/cputointel/misc.c Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPC.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPC.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPC.h Sun Jan 14 15:10:53 2007 @@ -12,11 +12,8 @@ /* here we put the prototype for the opcode api that brain need we show a example for it */ CPU_INT PPC_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); - - -CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, - CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, - CPU_INT mode); +CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); +CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, CPU_INT mode); /* Export comment thing see m68k for example * in dummy we do not show it, for it is diffent for each cpu Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.c Sun Jan 14 15:10:53 2007 @@ -53,6 +53,19 @@ CPU_INT retsize; + /* 0x12 = 0001 0010, + 0x10 = 0001 0000 + 0x13 = 0001 0011 + + 0x20 = 0010 0000 0 0000 0010 2 + 0x80 = 1000 0000 0 0000 1000 8 + 0x4e = 0010 1110 E 1110 0010 2 + + 0x20 00 80 4e + 0010 0000 0000 0000 1000 0000 0100 1110 + + */ + /* now we start the process */ while (cpu_pos<cpu_size) { @@ -60,10 +73,21 @@ cpuint = GetData32Le(&cpu_buffer[cpu_pos]); - /* Add */ - if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Addx))) == ConvertBitToByte32(cpuPPCInit_Addx)) + ///* Add */ + //if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Addx))) == ConvertBitToByte32(cpuPPCInit_Addx)) + //{ + // retsize = PPC_Addx( outfp, cpu_buffer, cpu_pos, cpu_size, + // BaseAddress, cpuarch, mode); + // if (retsize<0) + // retcode = 1; + // else + // cpu_pos += retsize; + //} + + /* 0x38 Ld aslo known as Li */ + if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Ld))) == ConvertBitToByte32(cpuPPCInit_Ld)) { - retsize = PPC_Addx( outfp, cpu_buffer, cpu_pos, cpu_size, + retsize = PPC_Ld( outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress, cpuarch, mode); if (retsize<0) retcode = 1; @@ -71,10 +95,10 @@ cpu_pos += retsize; } - /* Ld aslo known as Li */ - if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Ld))) == ConvertBitToByte32(cpuPPCInit_Ld)) + /* hard code the op blr */ + if ((cpuint - (cpuint & GetMaskByte32(cpuPPCInit_Blr))) == ConvertBitToByte32(cpuPPCInit_Blr)) { - retsize = PPC_Ld( outfp, cpu_buffer, cpu_pos, cpu_size, + retsize = PPC_Blr( outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress, cpuarch, mode); if (retsize<0) retcode = 1; @@ -106,5 +130,5 @@ break; } } - return retcode; + return retcode; } Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCBrain.h Sun Jan 14 15:10:53 2007 @@ -9,6 +9,7 @@ * same. thuse bit are always 0 or 1 */ CPU_BYTE cpuPPCInit_Addx[32] = {2,0,1,0,1,0,0,0,0,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,0}; +CPU_BYTE cpuPPCInit_Blr[32] = {0,0,1,0,0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0,0,0,0,0,0,1,0,0,1,1,1,0}; CPU_BYTE cpuPPCInit_Ld[32] = {0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,1,1,1,0,0,0}; Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 14 15:10:53 2007 @@ -44,6 +44,31 @@ return -1; } +CPU_INT PPC_Blr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, + CPU_INT mode) +{ + + BaseAddress +=cpu_pos; + if (mode==0) + { + fprintf(out,"Line_0x%08x:\n",BaseAddress); + fprintf(out,"blr\n"); + } + else if (mode>0) + { + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ + { + return -1; + } + pMyBrainAnalys->op = OP_ANY_ret; + pMyBrainAnalys->memAdr=BaseAddress; + } + + return 4; +} + CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch, Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Sun Jan 14 15:10:53 2007 @@ -1,7 +1,7 @@ #define OP_ANY_mov 0x00000000 - +#define OP_ANY_ret 0x00000001 typedef struct _BrainAnalys { Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Sun Jan 14 15:10:53 2007 @@ -161,7 +161,13 @@ CPU_INT FreeAny() { - PMYBrainAnalys tmp; + PMYBrainAnalys tmp = NULL; + + if (pMyBrainAnalys == NULL) + { + return -1; + } + tmp = (PMYBrainAnalys)pMyBrainAnalys->ptr_prev; while (pMyBrainAnalys != NULL)

17 years, 11 months

[greatlrd] 25447: Fixing a bug in ppc opcode Li Fixing the memory leak bug Full implement of the Li Convert Li to my own asm langues, opcode move reg, imm Left todo is add the anyalying process and converting process, after that we can translate our frist public pe file for ppc to intel with one opcode, it must be Li

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 13:57:18 2007 New Revision: 25447 URL: http://svn.reactos.org/svn/reactos?rev=25447&view=rev Log: Fixing a bug in ppc opcode Li Fixing the memory leak bug Full implement of the Li Convert Li to my own asm langues, opcode move reg,imm Left todo is add the anyalying process and converting process, after that we can translate our frist public pe file for ppc to intel with one opcode, it must be Li Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/ImageLoader.c trunk/rosapps/devutils/cputointel/any_op.h trunk/rosapps/devutils/cputointel/misc.c trunk/rosapps/devutils/cputointel/misc.h Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 14 13:57:18 2007 @@ -4,6 +4,10 @@ #include "PPC.h" #include "../../misc.h" #include "../../any_op.h" + +/* reg r0-r31 + r3 = eax + */ /* cpuDummyInit_Add * Input param : @@ -51,16 +55,22 @@ CPU_UNINT opcode; opcode = GetData32Le(cpu_buffer); + formD = (opcode & ConvertBitToByte32(PPC_D)) >> 6; formA = (opcode & ConvertBitToByte32(PPC_A)) >> 13; - formD = (opcode & ConvertBitToByte32(PPC_D)) >> 10; formDS = (opcode & ConvertBitToByte32(PPC_ds)) >> 15; - fprintf(out,"Line_0x%08x:\n",BaseAddress + cpu_pos); + if (formD != 0) + { + return 0; + } + + BaseAddress +=cpu_pos; if (mode==0) { + fprintf(out,"Line_0x%08x:\n",BaseAddress); fprintf(out,"li %%r%d,%d\n",formA, formDS); } - if (mode!=0) + else if (mode>0) { /* own translatons langues */ if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ @@ -72,9 +82,9 @@ pMyBrainAnalys->src_size = 16; pMyBrainAnalys->src = formDS; pMyBrainAnalys->dst = formA; + pMyBrainAnalys->memAdr=BaseAddress; } - printf(";not full implement \n"); return 4; } Modified: trunk/rosapps/devutils/cputointel/ImageLoader.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/ImageL… ============================================================================== --- trunk/rosapps/devutils/cputointel/ImageLoader.c (original) +++ trunk/rosapps/devutils/cputointel/ImageLoader.c Sun Jan 14 13:57:18 2007 @@ -29,6 +29,7 @@ CPU_BYTE *cpu_buffer; CPU_UNINT cpu_pos = 0; CPU_UNINT cpu_size=0; + CPU_INT ret; //fopen("testms.exe","RB"); @@ -113,6 +114,7 @@ { type=1; } + FreeAny(); fclose(outfp); return 0; } @@ -120,25 +122,62 @@ if (type== 1) { if (stricmp(cpuid,"m68000")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68000,outfp,mode); + FreeAny(); + fclose(outfp); + } else if (stricmp(cpuid,"m68010")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68010,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } else if (stricmp(cpuid,"m68020")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68020,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } else if (stricmp(cpuid,"m68030")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68030,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } else if (stricmp(cpuid,"m68040")) - return M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); + { + ret = M68KBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,68040,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } else if (stricmp(cpuid,"ppc")) - return PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); + { + ret = PPCBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,0,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } else if (stricmp(cpuid,"arm4")) - return ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); + { + ret = ARMBrain(cpu_buffer,cpu_pos,cpu_size,BaseAddress,4,outfp,mode); + FreeAny(); + fclose(outfp); + return ret; + } } if (type==2) { - return PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); - + + ret = PEFileStart(cpu_buffer, 0, BaseAddress, cpu_size, outfp, mode); + FreeAny(); + fclose(outfp); + return ret; } return 0; Modified: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (original) +++ trunk/rosapps/devutils/cputointel/any_op.h Sun Jan 14 13:57:18 2007 @@ -9,11 +9,14 @@ CPU_INT type; /* 0 = source are memmory, 1 source are register */ /* 2 = dest are memmory, 4 dest are register */ /* 8 = source are imm */ + CPU_INT src_size; /* who many bits are src not vaild for reg*/ CPU_INT dst_size; /* who many bits are dst not vaild for reg*/ CPU_UNINT64 src; CPU_UNINT64 dst; + + CPU_UNINT memAdr; /* where are we in the current memory pos + baseaddress */ /* try translate the Adress to a name */ CPU_BYTE* ptr_next; /* hook next one */ Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Sun Jan 14 13:57:18 2007 @@ -159,8 +159,34 @@ return 0; } +CPU_INT FreeAny() +{ + PMYBrainAnalys tmp; + tmp = (PMYBrainAnalys)pMyBrainAnalys->ptr_prev; + + while (pMyBrainAnalys != NULL) + { + if (pMyBrainAnalys == NULL) + { + break; + } + + free(pMyBrainAnalys); + + if (pMyBrainAnalys != NULL) + { + printf("fail to free memory"); + return -1; + } + + pMyBrainAnalys = tmp; + } + + return 0; +} + Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Sun Jan 14 13:57:18 2007 @@ -24,3 +24,4 @@ CPU_UNINT GetData32Be(CPU_BYTE *cpu_buffer); CPU_INT AllocAny(); +CPU_INT FreeAny();

17 years, 11 months

[arty] 25446: Some additions for relocatable ppc dlls.

by arty＠svn.reactos.org

Author: arty Date: Sun Jan 14 06:02:43 2007 New Revision: 25446 URL: http://svn.reactos.org/svn/reactos?rev=25446&view=rev Log: Some additions for relocatable ppc dlls. Modified: branches/powerpc/reactos/tools/ppc-build/alink/alink.h branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp branches/powerpc/reactos/tools/ppc-build/alink/output.cpp Modified: branches/powerpc/reactos/tools/ppc-build/alink/alink.h URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/alink/alink.h (original) +++ branches/powerpc/reactos/tools/ppc-build/alink/alink.h Sun Jan 14 06:02:43 2007 @@ -375,6 +375,7 @@ #define R_PPC_ADDR16_HI 5 #define R_PPC_ADDR16_HA 6 #define R_PPC_REL24 10 +#define R_PPC_PLTREL24 18 #define R_PPC_UADDR32 24 #define R_PPC_REL32 26 #define R_PPC_SECTOFF 33 @@ -397,6 +398,11 @@ #define IMAGE_REL_PPC_SECRELLO 0x13 #define IMAGE_REL_PPC_SECRELHI 0x14 #define IMAGE_REL_PPC_GPREL 0x15 +#define IMAGE_REL_BASED_ABSOLUTE 0 +#define IMAGE_REL_BASED_HIGH 1 +#define IMAGE_REL_BASED_LOW 2 +#define IMAGE_REL_BASED_HIGHLOW 3 +#define IMAGE_REL_BASED_HIGHADJ 4 #define OUTPUT_COM 1 #define OUTPUT_EXE 2 Modified: branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/alink/elf.cpp Sun Jan 14 06:02:43 2007 @@ -306,12 +306,22 @@ elf32sym.st_name); #if 0 + const char *segname = + elf32sym.st_shndx & 0x8000 ? + "*SPC*" : + (char *) + (&stringList[0] + + stringListOffsets[elf32hdr.e_shtrndx] + + elf32shdr[elf32sym.st_shndx].sh_name); + fprintf(stderr, "S[%05x] value %08x size %08x info %08x " - "other %08x shndx %08x %s\n", + "other %08x shndx %08x (%-10s) %s\n", j, elf32sym.st_value, elf32sym.st_size, elf32sym.st_info, - elf32sym.st_other, elf32sym.st_shndx, sym[j].name.c_str()); + elf32sym.st_other, elf32sym.st_shndx, + segname, + sym[j].name.c_str()); #endif if(!case_sensitive) @@ -608,6 +618,7 @@ reloc->rtype = FIX_PPC_ADDR24; break; + case R_PPC_PLTREL24: case R_PPC_REL24: reloc->rtype = FIX_PPC_REL24; break; Modified: branches/powerpc/reactos/tools/ppc-build/alink/output.cpp URL: http://svn.reactos.org/svn/reactos/branches/powerpc/reactos/tools/ppc-build… ============================================================================== --- branches/powerpc/reactos/tools/ppc-build/alink/output.cpp (original) +++ branches/powerpc/reactos/tools/ppc-build/alink/output.cpp Sun Jan 14 06:02:43 2007 @@ -1216,6 +1216,9 @@ case FIX_SELF_OFS16_2: case FIX_SELF_LBYTE: case FIX_RVA32: + case FIX_REL32: + case FIX_PPC_REL24: + case FIX_PPC_SECTOFF: continue; /* self-relative fixups and RVA fixups don't relocate */ default: break; @@ -1260,8 +1263,20 @@ break; case FIX_PTR1632: case FIX_OFS32: - case FIX_OFS32_2: + case FIX_OFS32_2: j|= PE_REL_OFS32; + + case FIX_ADDR32: + j = (IMAGE_REL_BASED_HIGHLOW << 12) | (j & 0xfff); + break; + + case FIX_PPC_RVA16LO: + j = (IMAGE_REL_BASED_LOW << 12) | (j & 0xfff); + break; + + case FIX_PPC_RVA16HA: + j = (IMAGE_REL_BASED_HIGHADJ << 12) | (j & 0xfff); + break; } /* store relocation */ put16(relocSect->data, relocSect->length, j); @@ -2382,6 +2397,7 @@ for(i=0;i<outlist.size();i++) { + fprintf(stderr, "Segment %08x: %s\n", outlist[i]->getbase(), outlist[i]->name.c_str()); if(outlist[i] && ((outlist[i]->attr&SEG_ALIGN) !=SEG_ABS)) { /* ensure section is aligned to file-Align */

17 years, 11 months

[greatlrd] 25445: start on adding the own langues, this version create a memory leak if u try run this tool in translate mode. but not in disambler mode. (only true for ppc brain about memory leak)

by greatlrd＠svn.reactos.org

Author: greatlrd Date: Sun Jan 14 02:26:32 2007 New Revision: 25445 URL: http://svn.reactos.org/svn/reactos?rev=25445&view=rev Log: start on adding the own langues, this version create a memory leak if u try run this tool in translate mode. but not in disambler mode. (only true for ppc brain about memory leak) Added: trunk/rosapps/devutils/cputointel/any_op.h (with props) Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c trunk/rosapps/devutils/cputointel/misc.c trunk/rosapps/devutils/cputointel/misc.h Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (original) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sun Jan 14 02:26:32 2007 @@ -4,6 +4,10 @@ #include <stdlib.h> #include <string.h> #include "misc.h" +#include "any_op.h" + +PMYBrainAnalys pMyBrainAnalys = NULL; + int main(int argc, char * argv[]) { @@ -89,7 +93,6 @@ } - return LoadPFileImage(infile,outfile,BaseAddress,cpuid,type, mode); //return LoadPFileImage("e:\\testms.exe","e:\\cputointel.asm",0,0,0,0); Modified: trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/From/P… ============================================================================== --- trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c (original) +++ trunk/rosapps/devutils/cputointel/From/PPC/PPCopcode.c Sun Jan 14 02:26:32 2007 @@ -3,7 +3,7 @@ #include <stdlib.h> #include "PPC.h" #include "../../misc.h" - +#include "../../any_op.h" /* cpuDummyInit_Add * Input param : @@ -39,11 +39,6 @@ printf(";Add unimplement\n"); return -1; } - // stb - - // li %r3, 0 : op 00 00 60 38 - // li = ld -// 0000 0000 0000 0000 0100 0000 0011 1000 CPU_INT PPC_Ld( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, @@ -60,10 +55,23 @@ formD = (opcode & ConvertBitToByte32(PPC_D)) >> 10; formDS = (opcode & ConvertBitToByte32(PPC_ds)) >> 15; + fprintf(out,"Line_0x%08x:\n",BaseAddress + cpu_pos); if (mode==0) { - fprintf(out,"Line_0x%08x:\n",BaseAddress + cpu_pos); fprintf(out,"li %%r%d,%d\n",formA, formDS); + } + if (mode!=0) + { + /* own translatons langues */ + if (AllocAny()!=0) /* alloc memory for pMyBrainAnalys */ + { + return -1; + } + pMyBrainAnalys->op = OP_ANY_mov; + pMyBrainAnalys->type= 1 + 8; /* 1 dst reg, 8 imm */ + pMyBrainAnalys->src_size = 16; + pMyBrainAnalys->src = formDS; + pMyBrainAnalys->dst = formA; } printf(";not full implement \n"); Added: trunk/rosapps/devutils/cputointel/any_op.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/any_op… ============================================================================== --- trunk/rosapps/devutils/cputointel/any_op.h (added) +++ trunk/rosapps/devutils/cputointel/any_op.h Sun Jan 14 02:26:32 2007 @@ -1,0 +1,24 @@ + + +#define OP_ANY_mov 0x00000000 + + +typedef struct _BrainAnalys +{ + CPU_UNINT op; /* one tranlator for any cpu type set our own opcode */ + CPU_INT type; /* 0 = source are memmory, 1 source are register */ + /* 2 = dest are memmory, 4 dest are register */ + /* 8 = source are imm */ + CPU_INT src_size; /* who many bits are src not vaild for reg*/ + CPU_INT dst_size; /* who many bits are dst not vaild for reg*/ + + CPU_UNINT64 src; + CPU_UNINT64 dst; + + /* try translate the Adress to a name */ + CPU_BYTE* ptr_next; /* hook next one */ + CPU_BYTE* ptr_prev; /* hook previus one */ +} MYBrainAnalys, *PMYBrainAnalys; + +extern PMYBrainAnalys pMyBrainAnalys; + Propchange: trunk/rosapps/devutils/cputointel/any_op.h ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/cputointel/misc.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.c… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.c (original) +++ trunk/rosapps/devutils/cputointel/misc.c Sun Jan 14 02:26:32 2007 @@ -7,6 +7,7 @@ #include <stdlib.h> #include <string.h> #include "misc.h" +#include "any_op.h" #include "From/ARM/ARM.h" #include "From/m68k/m68k.h" #include "From/PPC/PPC.h" @@ -128,7 +129,35 @@ } -// add no carry +CPU_INT AllocAny() +{ + + if (pMyBrainAnalys== NULL) + { + pMyBrainAnalys = (PMYBrainAnalys) malloc(sizeof(MYBrainAnalys)); + if (pMyBrainAnalys==NULL) + { + return -1; + } + ZeroMemory(pMyBrainAnalys,sizeof(MYBrainAnalys)); + } + else + { + PMYBrainAnalys tmp; + tmp = (PMYBrainAnalys) malloc(sizeof(MYBrainAnalys)); + if (tmp==NULL) + { + return -1; + } + ZeroMemory(pMyBrainAnalys,sizeof(MYBrainAnalys)); + + pMyBrainAnalys->ptr_next = (CPU_BYTE*)tmp; + tmp->ptr_prev= (CPU_BYTE*)pMyBrainAnalys; + + pMyBrainAnalys = tmp; + } +return 0; +} Modified: trunk/rosapps/devutils/cputointel/misc.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/misc.h… ============================================================================== --- trunk/rosapps/devutils/cputointel/misc.h (original) +++ trunk/rosapps/devutils/cputointel/misc.h Sun Jan 14 02:26:32 2007 @@ -23,3 +23,4 @@ CPU_UNINT GetData32Le(CPU_BYTE *cpu_buffer); CPU_UNINT GetData32Be(CPU_BYTE *cpu_buffer); +CPU_INT AllocAny();

17 years, 11 months

← Newer
1
...
19
20
21
22
23
24
25
...
41
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs January 2007