Ros-diffs December 2006

ros-diffs@reactos.org

16 participants
168 discussions

[greatlrd] 25257: 1. setup input param to main 2. implement cpu type flag in dummy and m68k 3. Adding more opcode for m68k, but they are stubed Time to test the code and start implement m68k in next commit
by greatlrd＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: greatlrd Date: Sun Dec 31 21:45:35 2006 New Revision: 25257 URL: http://svn.reactos.org/svn/reactos?rev=25257&view=rev Log: 1. setup input param to main 2. implement cpu type flag in dummy and m68k 3. Adding more opcode for m68k, but they are stubed Time to test the code and start implement m68k in next commit Modified: trunk/rosapps/devutils/cputointel/CpuToIntel.c trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c trunk/rosapps/devutils/cputointel/m68k/m68k.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 Dec 31 21:45:35 2006 @@ -1,17 +1,27 @@ #include <stdio.h> +#include <stdlib.h> +#include <string.h> #include "m68k/m68k.h" #include "misc.h" int main(int argc, char * argv[]) { + CPU_UNINT BaseAddress=0; + int t=0; + char *infile=NULL; + char *outfile=NULL; + printf("Usage :\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("--------------------------------------------------------------\n"); + printf(".......-BaseAddress adr : the start base address only accpect \n"); + printf("....... dec value"); printf("--------------------------------------------------------------\n"); printf(" -inBin filename : the bin file you whant convert\n"); printf(" -OutAsm filename : the Asm file you whant create\n"); @@ -22,6 +32,43 @@ 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 < 7) + return .110; + + for (t=1; t<7;t+=2) + { + if (stricmp(argv[t],"-inBin")) + { + infile = argv[t+1]; + } + if (stricmp(argv[t],"-OutAsm")) + { + outfile = argv[t+1]; + } + if (stricmp(argv[t],"-BaseAddress")) + { + BaseAddress = atol(argv[t+1]); + } + + + } + + for (t=1;t<7;t+=2) + { + if (stricmp(argv[1],"-cpu")) + { + if (stricmp(argv[2],"m68000")) + return M68KBrain(infile, outfile, BaseAddress, 68000); + else if (stricmp(argv[2],"m68010")) + return M68KBrain(infile, outfile, BaseAddress, 68010); + else if (stricmp(argv[2],"m68020")) + return M68KBrain(infile, outfile, BaseAddress, 68020); + else if (stricmp(argv[2],"m68030")) + return M68KBrain(infile, outfile, BaseAddress, 68030); + else if (stricmp(argv[2],"m68040")) + return M68KBrain(infile, outfile, BaseAddress, 68040); + } + } return 0; } Modified: trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h Sun Dec 31 21:45:35 2006 @@ -2,7 +2,7 @@ #include "../misc.h" /* here we put the prototype for the opcode api that brain need we show a example for it */ -CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); /* Export comment thing see m68k for example Modified: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c Sun Dec 31 21:45:35 2006 @@ -18,7 +18,8 @@ * 9 = can not read file */ -CPU_INT DummyBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress) +CPU_INT DummyBrain(char *infileName, char *outputfileName, + CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { FILE *infp; FILE *outfp; @@ -102,9 +103,10 @@ /* Add */ if ((cpuint - (cpuint & GetMaskByte(cpuDummyInit_Add))) == ConvertBitToByte(cpuDummyInit_Add)) { - retsize = DUMMY_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = DUMMY_Add( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } Modified: trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c (original) +++ trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c Sun Dec 31 21:45:35 2006 @@ -12,6 +12,10 @@ * cpu_pos : Current positions in the cpu_buffer * cpu_size : The memory size of the cpu_buffer * BaseAddress : The base address you whant the binay file should run from + * cpuarch : if it exists diffent cpu from a manufactor like pentium, + * pentinum-mmx so on, use this flag to specify which type + * of cpu you whant or do not use it if it does not exists + * other or any sub model. * * Return value : * value -1 : unimplement @@ -19,7 +23,8 @@ * value +1 and higher : who many byte we should add to cpu_pos */ -CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT DUMMY_Add( 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/m68k/M68kBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c Sun Dec 31 21:45:35 2006 @@ -18,7 +18,7 @@ * 9 = can not read file */ -CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress) +CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { FILE *infp; FILE *outfp; @@ -77,7 +77,7 @@ { printf("error can not alloc %uld size for memory buffer",cpu_size); fclose(infp); - fclose(outfp); + fclose(outfp); return 8; } @@ -92,7 +92,7 @@ } fclose(infp); - /* now we start the process */ + /* now we start the process */ while (cpu_pos<cpu_size) { cpu_oldpos = cpu_pos; @@ -102,63 +102,70 @@ /* Abcd */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Abcd))) == ConvertBitToByte(cpuM68kInit_Abcd)) { - retsize = M68k_Abcd(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Abcd( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* Add */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Add))) == ConvertBitToByte(cpuM68kInit_Add)) { - retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* Addi */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addi))) == ConvertBitToByte(cpuM68kInit_Addi)) { - retsize = M68k_Addi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Addi( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* Addq */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addq))) == ConvertBitToByte(cpuM68kInit_Addq)) { - retsize = M68k_Addq(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Addq( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* Addx */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addx))) == ConvertBitToByte(cpuM68kInit_Addx)) { - retsize = M68k_Addx(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Addx( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* And */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_And))) == ConvertBitToByte(cpuM68kInit_And)) { - retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Add( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } /* Andi */ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Andi))) == ConvertBitToByte(cpuM68kInit_Andi)) { - retsize = M68k_Andi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_Andi( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } @@ -169,9 +176,10 @@ if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_AndToCCRS))) == ConvertBitToByte(cpuM68kInit_AndToCCRS)) { cpu_pos++; - retsize = M68k_AndToCCR(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); - if (retsize<0) - retcode = 1; + retsize = M68k_AndToCCR( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; else cpu_pos += retsize; } @@ -179,6 +187,160 @@ { cpuint = cpu_buffer[cpu_pos]; } + } + + /* Bhi */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bhi))) == ConvertBitToByte(cpuM68kInit_Bhi)) + { + retsize = M68k_Bhi( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bls */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bls))) == ConvertBitToByte(cpuM68kInit_Bls)) + { + retsize = M68k_Bls( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bcc */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcc))) == ConvertBitToByte(cpuM68kInit_Bcc)) + { + retsize = M68k_Bcc( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bcs */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bcs))) == ConvertBitToByte(cpuM68kInit_Bcs)) + { + retsize = M68k_Bcs( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bne */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bne))) == ConvertBitToByte(cpuM68kInit_Bne)) + { + retsize = M68k_Bne( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Beq */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Beq))) == ConvertBitToByte(cpuM68kInit_Beq)) + { + retsize = M68k_Beq( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bvc */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvc))) == ConvertBitToByte(cpuM68kInit_Bvc)) + { + retsize = M68k_Bvc( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bvs */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bvs))) == ConvertBitToByte(cpuM68kInit_Bvs)) + { + retsize = M68k_Bvs( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bpl */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bpl))) == ConvertBitToByte(cpuM68kInit_Bpl)) + { + retsize = M68k_Bpl( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bmi */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bmi))) == ConvertBitToByte(cpuM68kInit_Bmi)) + { + retsize = M68k_Bmi( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bge */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bge))) == ConvertBitToByte(cpuM68kInit_Bge)) + { + retsize = M68k_Bge( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Blt */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Blt))) == ConvertBitToByte(cpuM68kInit_Blt)) + { + retsize = M68k_Blt( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Bgt */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Bgt))) == ConvertBitToByte(cpuM68kInit_Bgt)) + { + retsize = M68k_Bgt( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Ble */ + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Ble))) == ConvertBitToByte(cpuM68kInit_Ble)) + { + retsize = M68k_Ble( outfp, cpu_buffer, cpu_pos, cpu_size, + BaseAddress, cpuarch); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; } /* Found all Opcode and breakout and return no error found */ Modified: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h Sun Dec 31 21:45:35 2006 @@ -13,6 +13,21 @@ CPU_BYTE cpuM68kInit_Asl[16] = {1,1,1,0,2,2,2,0,2,2,2,0,0,2,2,2}; CPU_BYTE cpuM68kInit_Asr[16] = {1,1,1,0,2,2,2,1,2,2,2,0,0,2,2,2}; +CPU_BYTE cpuM68kInit_Bhi[16] = {0,1,1,0,0,0,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bls[16] = {0,1,1,0,0,0,1,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bcc[16] = {0,1,1,0,0,1,0,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bcs[16] = {0,1,1,0,0,1,0,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bne[16] = {0,1,1,0,0,1,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Beq[16] = {0,1,1,0,0,1,1,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bvc[16] = {0,1,1,0,1,0,0,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bvs[16] = {0,1,1,0,1,0,0,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bpl[16] = {0,1,1,0,1,0,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bmi[16] = {0,1,1,0,1,0,1,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bge[16] = {0,1,1,0,1,1,0,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Blt[16] = {0,1,1,0,1,1,0,1,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Bgt[16] = {0,1,1,0,1,1,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Ble[16] = {0,1,1,0,1,1,1,1,2,2,2,2,2,2,2,2}; + CPU_BYTE M68k_Rx[16] = {0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0}; CPU_BYTE M68k_RM[16] = {0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0}; Modified: trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c Sun Dec 31 21:45:35 2006 @@ -5,7 +5,8 @@ #include "misc.h" -CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Abcd( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -13,7 +14,8 @@ return -1; } -CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { CPU_INT opmode; CPU_INT mode; @@ -84,7 +86,8 @@ return -1; } -CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Addi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -92,7 +95,8 @@ return -1; } -CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Addq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -100,7 +104,8 @@ return -1; } -CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Addx( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -108,7 +113,8 @@ return -1; } -CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_And( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -116,7 +122,8 @@ return -1; } -CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Andi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -124,7 +131,8 @@ return -1; } -CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_AndToCCR( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -132,7 +140,8 @@ return -1; } -CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Asl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -140,7 +149,8 @@ return -1; } -CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +CPU_INT M68k_Asr( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) { fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); @@ -148,3 +158,130 @@ return -1; } +CPU_INT M68k_Bhi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bhi unimplement\n"); + return -1; +} + +CPU_INT M68k_Bls( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bls unimplement\n"); + return -1; +} + +CPU_INT M68k_Bcc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bcc unimplement\n"); + return -1; +} + +CPU_INT M68k_Bcs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bcs unimplement\n"); + return -1; +} + +CPU_INT M68k_Bne( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bne unimplement\n"); + return -1; +} + +CPU_INT M68k_Beq( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Beq unimplement\n"); + return -1; +} + +CPU_INT M68k_Bvc( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bvc unimplement\n"); + return -1; +} + +CPU_INT M68k_Bvs( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bvs unimplement\n"); + return -1; +} + +CPU_INT M68k_Bpl( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bpl unimplement\n"); + return -1; +} + +CPU_INT M68k_Bmi( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bmi unimplement\n"); + return -1; +} + +CPU_INT M68k_Bge( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bge unimplement\n"); + return -1; +} + +CPU_INT M68k_Blt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Blt unimplement\n"); + return -1; +} + +CPU_INT M68k_Bgt( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Bgt unimplement\n"); + return -1; +} + +CPU_INT M68k_Ble( FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, + CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Ble unimplement\n"); + return -1; +} + + Modified: trunk/rosapps/devutils/cputointel/m68k/m68k.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/m68k.h (original) +++ trunk/rosapps/devutils/cputointel/m68k/m68k.h Sun Dec 31 21:45:35 2006 @@ -1,16 +1,31 @@ #include "../misc.h" +CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); -CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bhi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bls(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bcc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bcs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bne(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Beq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bvc(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bvs(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bpl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bmi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bge(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Blt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Bgt(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); +CPU_INT M68k_Ble(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress, CPU_UNINT cpuarch); extern CPU_BYTE M68k_Rx[16]; extern CPU_BYTE M68k_RM[16];

1 0

[mbosma] 25256: include the xml of the downloader.
by mbosma＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: mbosma Date: Sun Dec 31 20:40:39 2006 New Revision: 25256 URL: http://svn.reactos.org/svn/reactos?rev=25256&view=rev Log: include the xml of the downloader. Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Dec 31 20:40:39 2006 @@ -38,6 +38,7 @@ base\applications\devmgr\devmgrapp.exe 1 base\applications\devmgmt\devmgmt.exe 1 base\applications\downloader\downloader.exe 1 +base\applications\downloader\apps.xml 1 base\applications\games\solitaire\sol.exe 1 base\applications\games\winemine\winemine.exe 1 base\applications\getfirefox\getfirefox.exe 1

1 0

[mbosma] 25255: Recommit changes from cc branch, without the hackish changes to create.c.
by mbosma＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: mbosma Date: Sun Dec 31 19:43:40 2006 New Revision: 25255 URL: http://svn.reactos.org/svn/reactos?rev=25255&view=rev Log: Recommit changes from cc branch, without the hackish changes to create.c. Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c trunk/reactos/drivers/filesystems/vfat/create.c Modified: trunk/reactos/drivers/filesystems/vfat/cleanup.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/cleanup.c (original) +++ trunk/reactos/drivers/filesystems/vfat/cleanup.c Sun Dec 31 19:43:40 2006 @@ -29,15 +29,40 @@ pFcb = (PVFATFCB) FileObject->FsContext; if (pFcb) { - if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && - FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) - { - /* remove all locks this process have on this file */ - FsRtlFastUnlockAll(&pFcb->FileLock, - FileObject, - IoGetRequestorProcess(IrpContext->Irp), - NULL); - } + if (pFcb->Flags & FCB_IS_VOLUME) + { + pFcb->OpenHandleCount--; + + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + } + else + { + if(!ExAcquireResourceExclusiveLite (&pFcb->MainResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + return STATUS_PENDING; + } + if(!ExAcquireResourceExclusiveLite (&pFcb->PagingIoResource, + (BOOLEAN)(IrpContext->Flags & IRPCONTEXT_CANWAIT))) + { + ExReleaseResourceLite (&pFcb->MainResource); + return STATUS_PENDING; + } + + pFcb->OpenHandleCount--; + + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY) && + FsRtlAreThereCurrentFileLocks(&pFcb->FileLock)) + { + /* remove all locks this process have on this file */ + FsRtlFastUnlockAll(&pFcb->FileLock, + FileObject, + IoGetRequestorProcess(IrpContext->Irp), + NULL); + } if (pFcb->Flags & FCB_IS_DIRTY) { @@ -71,10 +96,21 @@ #ifdef USE_ROS_CC_AND_FS CcRosReleaseFileCache (FileObject); #else - CcUninitializeCacheMap (FileObject, NULL, NULL); + if (FileObject->SectionObjectPointer->SharedCacheMap) + { + CcUninitializeCacheMap (FileObject, &pFcb->RFCB.FileSize, NULL); + } #endif - pFcb->OpenHandleCount--; - IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + if (pFcb->OpenHandleCount != 0) + { + IoRemoveShareAccess(FileObject, &pFcb->FCBShareAccess); + } + + FileObject->Flags |= FO_CLEANUP_COMPLETE; + + ExReleaseResourceLite (&pFcb->PagingIoResource); + ExReleaseResourceLite (&pFcb->MainResource); + } } return STATUS_SUCCESS; } @@ -104,6 +140,11 @@ ExReleaseResourceLite (&IrpContext->DeviceExt->DirResource); + if (Status == STATUS_PENDING) + { + return VfatQueueRequest(IrpContext); + } + ByeBye: IrpContext->Irp->IoStatus.Status = Status; IrpContext->Irp->IoStatus.Information = 0; Modified: trunk/reactos/drivers/filesystems/vfat/create.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/filesystems/vfat/c… ============================================================================== --- trunk/reactos/drivers/filesystems/vfat/create.c (original) +++ trunk/reactos/drivers/filesystems/vfat/create.c Sun Dec 31 19:43:40 2006 @@ -656,7 +656,24 @@ VfatCloseFile (DeviceExt, FileObject); return(STATUS_NOT_A_DIRECTORY); } - +#ifndef USE_ROS_CC_AND_FS + if (!(*pFcb->Attributes & FILE_ATTRIBUTE_DIRECTORY)) + { + if (Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA || + RequestedDisposition == FILE_OVERWRITE || + RequestedDisposition == FILE_OVERWRITE_IF) + { + if (!MmFlushImageSection(&pFcb->SectionObjectPointers, MmFlushForWrite)) + { + DPRINT1("%wZ\n", &pFcb->PathNameU); + DPRINT1("%d %d %d\n", Stack->Parameters.Create.SecurityContext->DesiredAccess & FILE_WRITE_DATA, + RequestedDisposition == FILE_OVERWRITE, RequestedDisposition == FILE_OVERWRITE_IF); + VfatCloseFile (DeviceExt, FileObject); + return STATUS_SHARING_VIOLATION; + } + } + } +#endif if (PagingFileCreate) { /* FIXME:

1 0

[greatlrd] 25254: 1. Adding a dummycpu showing how you can write you own cpu brain. 2. Did make some cleanup work for m68k
by greatlrd＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: greatlrd Date: Sun Dec 31 19:03:07 2006 New Revision: 25254 URL: http://svn.reactos.org/svn/reactos?rev=25254&view=rev Log: 1. Adding a dummycpu showing how you can write you own cpu brain. 2. Did make some cleanup work for m68k Added: trunk/rosapps/devutils/cputointel/dummycpu/ trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h (with props) trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c (with props) trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.h (with props) trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c (with props) Modified: trunk/rosapps/devutils/cputointel/cputointel.rbuild trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c trunk/rosapps/devutils/cputointel/m68k/m68k.h 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 Dec 31 19:03:07 2006 @@ -12,4 +12,7 @@ <file>m68k/M68kBrain.c</file> <file>m68k/M68kopcode.c</file> + <file>dummycpu/DummyBrain.c</file> + <file>dummycpu/Dummyopcode.c</file> + </module> Added: trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h (added) +++ trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h Sun Dec 31 19:03:07 2006 @@ -1,0 +1,10 @@ + +#include "../misc.h" + +/* here we put the prototype for the opcode api that brain need we show a example for it */ +CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); + + +/* Export comment thing see m68k for example + * in dummy we do not show it, for it is diffent for each cpu + */ Propchange: trunk/rosapps/devutils/cputointel/dummycpu/Dummy.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c (added) +++ trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c Sun Dec 31 19:03:07 2006 @@ -1,0 +1,137 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "DummyBrain.h" +#include "Dummy.h" +#include "../misc.h" + +/* retun + * 0 = Ok + * 1 = unimplemt + * 2 = Unkonwn Opcode + * 3 = can not open read file + * 4 = can not open write file + * 5 = can not seek to end of read file + * 6 = can not get the file size of the read file + * 7 = read file size is Zero + * 8 = can not alloc memory + * 9 = can not read file + */ + +CPU_INT DummyBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress) +{ + FILE *infp; + FILE *outfp; + CPU_BYTE *cpu_buffer; + CPU_UNINT cpu_pos = 0; + CPU_UNINT cpu_oldpos; + CPU_UNINT cpu_size=0; + CPU_INT cpuint; + CPU_INT retcode = 0; + CPU_INT retsize; + + /* 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; + } + + 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))) + { + printf("error can not alloc %uld size for memory buffer",cpu_size); + fclose(infp); + fclose(outfp); + return 8; + } + + /* read from the file now in one sweep */ + fread(cpu_buffer,1,cpu_size,infp); + if (!ferror(infp)) + { + printf("error can not read file "); + fclose(infp); + fclose(outfp); + return 9; + } + fclose(infp); + + /* now we start the process */ + while (cpu_pos<cpu_size) + { + cpu_oldpos = cpu_pos; + + cpuint = cpu_buffer[cpu_pos]; + + /* Add */ + if ((cpuint - (cpuint & GetMaskByte(cpuDummyInit_Add))) == ConvertBitToByte(cpuDummyInit_Add)) + { + retsize = DUMMY_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + + /* Found all Opcode and breakout and return no error found */ + if (cpu_pos >=cpu_size) + { + break; + } + + /* Check if we have found a cpu opcode */ + if (cpu_oldpos == cpu_pos) + { + if (retcode == 0) + { + /* no unimplement error where found so we return a msg for unknown opcode */ + printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]); + retcode = 2; + } + } + + /* Erorro Found ? */ + if (retcode!=0) + { + /* Erorro Found break and return the error code */ + break; + } + } + return retcode; +} Propchange: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.h (added) +++ trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.h Sun Dec 31 19:03:07 2006 @@ -1,0 +1,12 @@ + +#include "../misc.h" + + +/* example how setup a opcode, this opcode is 16bit long (taken from M68K) + * 0 and 1 mean normal bit, 2 mean mask bit the bit that are determent diffent + * thing in the opcode, example which reg so on, it can be etither 0 or 1 in + * the opcode. but a opcode have also normal bit that is always been set to + * same. thuse bit are always 0 or 1 + */ +CPU_BYTE cpuDummyInit_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; + Propchange: trunk/rosapps/devutils/cputointel/dummycpu/DummyBrain.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/dummyc… ============================================================================== --- trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c (added) +++ trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c Sun Dec 31 19:03:07 2006 @@ -1,0 +1,35 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "Dummy.h" +#include "misc.h" + + +/* cpuDummyInit_Add + * Input param : + * out : The file pointer that we write to (the output file to intel asm) + * cpu_buffer : The memory buffer we have our binary code that we whant convert + * cpu_pos : Current positions in the cpu_buffer + * cpu_size : The memory size of the cpu_buffer + * BaseAddress : The base address you whant the binay file should run from + * + * Return value : + * value -1 : unimplement + * value 0 : wrong opcode or not vaild opcode + * value +1 and higher : who many byte we should add to cpu_pos + */ + +CPU_INT DUMMY_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) + +{ + /* + * ConvertBitToByte() is perfect to use to get the bit being in use from a bit array + * GetMaskByte() is perfect if u whant known which bit have been mask out + * see M68kopcode.c and how it use the ConvertBitToByte() + */ + + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Add unimplement\n"); + return -1; +} Propchange: trunk/rosapps/devutils/cputointel/dummycpu/Dummyopcode.c ------------------------------------------------------------------------------ svn:eol-style = native Modified: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c Sun Dec 31 19:03:07 2006 @@ -100,7 +100,7 @@ cpuint = cpu_buffer[cpu_pos]; /* Abcd */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Abcd))) == ConvertBitToByte(cpuint_table_Abcd)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Abcd))) == ConvertBitToByte(cpuM68kInit_Abcd)) { retsize = M68k_Abcd(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -109,7 +109,7 @@ cpu_pos += retsize; } /* Add */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Add))) == ConvertBitToByte(cpuint_table_Add)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Add))) == ConvertBitToByte(cpuM68kInit_Add)) { retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -118,7 +118,7 @@ cpu_pos += retsize; } /* Addi */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addi))) == ConvertBitToByte(cpuint_table_Addi)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addi))) == ConvertBitToByte(cpuM68kInit_Addi)) { retsize = M68k_Addi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -127,7 +127,7 @@ cpu_pos += retsize; } /* Addq */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addq))) == ConvertBitToByte(cpuint_table_Addq)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addq))) == ConvertBitToByte(cpuM68kInit_Addq)) { retsize = M68k_Addq(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -136,7 +136,7 @@ cpu_pos += retsize; } /* Addx */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addx))) == ConvertBitToByte(cpuint_table_Addx)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Addx))) == ConvertBitToByte(cpuM68kInit_Addx)) { retsize = M68k_Addx(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -145,7 +145,7 @@ cpu_pos += retsize; } /* And */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_And))) == ConvertBitToByte(cpuint_table_And)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_And))) == ConvertBitToByte(cpuM68kInit_And)) { retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -154,7 +154,7 @@ cpu_pos += retsize; } /* Andi */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Andi))) == ConvertBitToByte(cpuint_table_Andi)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_Andi))) == ConvertBitToByte(cpuM68kInit_Andi)) { retsize = M68k_Andi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); if (retsize<0) @@ -163,10 +163,10 @@ cpu_pos += retsize; } /* AndToCCR */ - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_AndToCCRF))) == ConvertBitToByte(cpuint_table_AndToCCRF)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_AndToCCRF))) == ConvertBitToByte(cpuM68kInit_AndToCCRF)) { cpuint = cpu_buffer[cpu_pos+1]; - if ((cpuint - (cpuint & GetMaskByte(cpuint_table_AndToCCRS))) == ConvertBitToByte(cpuint_table_AndToCCRS)) + if ((cpuint - (cpuint & GetMaskByte(cpuM68kInit_AndToCCRS))) == ConvertBitToByte(cpuM68kInit_AndToCCRS)) { cpu_pos++; retsize = M68k_AndToCCR(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); @@ -177,7 +177,7 @@ } else { - cpuint = cpu_buffer[cpu_pos]; + cpuint = cpu_buffer[cpu_pos]; } } Modified: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h Sun Dec 31 19:03:07 2006 @@ -1,23 +1,23 @@ #include "../misc.h" -CPU_BYTE cpuint_table_Abcd[16] = {1,1,1,1,2,2,2,1,0,0,0,0,2,2,2,2}; -CPU_BYTE cpuint_table_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_Addi[16] = {0,0,0,0,0,1,1,0,2,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_Addq[16] = {0,1,0,1,2,2,2,0,2,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_Addx[16] = {1,1,0,1,2,2,2,1,2,2,0,0,2,2,2,2}; -CPU_BYTE cpuint_table_And[16] = {1,1,0,0,2,2,2,2,2,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_Andi[16] = {0,0,0,0,0,0,1,0,2,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_AndToCCRF[16] = {0,0,0,0,0,0,1,0,0,0,1,1,1,1,0,0}; -CPU_BYTE cpuint_table_AndToCCRS[16] = {0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2}; -CPU_BYTE cpuint_table_Asl[16] = {1,1,1,0,2,2,2,0,2,2,2,0,0,2,2,2}; -CPU_BYTE cpuint_table_Asr[16] = {1,1,1,0,2,2,2,1,2,2,2,0,0,2,2,2}; +CPU_BYTE cpuM68kInit_Abcd[16] = {1,1,1,1,2,2,2,1,0,0,0,0,2,2,2,2}; +CPU_BYTE cpuM68kInit_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Addi[16] = {0,0,0,0,0,1,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Addq[16] = {0,1,0,1,2,2,2,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Addx[16] = {1,1,0,1,2,2,2,1,2,2,0,0,2,2,2,2}; +CPU_BYTE cpuM68kInit_And[16] = {1,1,0,0,2,2,2,2,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Andi[16] = {0,0,0,0,0,0,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_AndToCCRF[16] = {0,0,0,0,0,0,1,0,0,0,1,1,1,1,0,0}; +CPU_BYTE cpuM68kInit_AndToCCRS[16] = {0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2}; +CPU_BYTE cpuM68kInit_Asl[16] = {1,1,1,0,2,2,2,0,2,2,2,0,0,2,2,2}; +CPU_BYTE cpuM68kInit_Asr[16] = {1,1,1,0,2,2,2,1,2,2,2,0,0,2,2,2}; -CPU_BYTE table_Rx[16] = {0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0}; -CPU_BYTE table_RM[16] = {0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0}; -CPU_BYTE table_Ry[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1}; -CPU_BYTE table_Opmode[16] = {0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0}; -CPU_BYTE table_Mode[16] = {0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0}; -CPU_BYTE table_Size[16] = {0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0}; +CPU_BYTE M68k_Rx[16] = {0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0}; +CPU_BYTE M68k_RM[16] = {0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0}; +CPU_BYTE M68k_Ry[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1}; +CPU_BYTE M68k_Opmode[16] = {0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0}; +CPU_BYTE M68k_Mode[16] = {0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0}; +CPU_BYTE M68k_Size[16] = {0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0}; Modified: trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c (original) +++ trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c Sun Dec 31 19:03:07 2006 @@ -21,10 +21,10 @@ CPU_INT Ry; //CPU_INT cpuint; - opmode = ConvertBitToByte(table_Opmode); - mode = ConvertBitToByte(table_Mode); - Rx = ConvertBitToByte(table_Rx); - Ry = ConvertBitToByte(table_Ry); + opmode = ConvertBitToByte(M68k_Opmode); + mode = ConvertBitToByte(M68k_Mode); + Rx = ConvertBitToByte(M68k_Rx); + Ry = ConvertBitToByte(M68k_Ry); fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); Modified: trunk/rosapps/devutils/cputointel/m68k/m68k.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/m68k.h (original) +++ trunk/rosapps/devutils/cputointel/m68k/m68k.h Sun Dec 31 19:03:07 2006 @@ -12,9 +12,9 @@ CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); -extern CPU_BYTE table_Rx[16]; -extern CPU_BYTE table_RM[16]; -extern CPU_BYTE table_Ry[16]; -extern CPU_BYTE table_Opmode[16]; -extern CPU_BYTE table_Mode[16]; -extern CPU_BYTE table_Size[16]; +extern CPU_BYTE M68k_Rx[16]; +extern CPU_BYTE M68k_RM[16]; +extern CPU_BYTE M68k_Ry[16]; +extern CPU_BYTE M68k_Opmode[16]; +extern CPU_BYTE M68k_Mode[16]; +extern CPU_BYTE M68k_Size[16];

1 0

[hpoussin] 25253: ... also check the return of IoCreateSymbolicLink
by hpoussin＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: hpoussin Date: Sun Dec 31 18:37:36 2006 New Revision: 25253 URL: http://svn.reactos.org/svn/reactos?rev=25253&view=rev Log: ... also check the return of IoCreateSymbolicLink Modified: trunk/reactos/drivers/base/blue/blue.c Modified: trunk/reactos/drivers/base/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.c?r… ============================================================================== --- trunk/reactos/drivers/base/blue/blue.c (original) +++ trunk/reactos/drivers/base/blue/blue.c Sun Dec 31 18:37:36 2006 @@ -817,18 +817,21 @@ sizeof(DEVICE_EXTENSION), &DeviceName, FILE_DEVICE_SCREEN, - 0, + FILE_DEVICE_SECURE_OPEN, TRUE, &DeviceObject); if (!NT_SUCCESS(Status)) - { + { return Status; - } - - IoCreateSymbolicLink (&SymlinkName, &DeviceName); - - return (STATUS_SUCCESS); + } + + Status = IoCreateSymbolicLink (&SymlinkName, &DeviceName); + if (NT_SUCCESS(Status)) + DeviceObject->Flags &= ~DO_DEVICE_INITIALIZING; + else + IoDeleteDevice (DeviceObject); + return Status; } /* EOF */

1 0

[janderwald] 25252: - check if IoCreateDevice succeeded...
by janderwald＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: janderwald Date: Sun Dec 31 18:28:20 2006 New Revision: 25252 URL: http://svn.reactos.org/svn/reactos?rev=25252&view=rev Log: - check if IoCreateDevice succeeded... Modified: trunk/reactos/drivers/base/blue/blue.c Modified: trunk/reactos/drivers/base/blue/blue.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/drivers/base/blue/blue.c?r… ============================================================================== --- trunk/reactos/drivers/base/blue/blue.c (original) +++ trunk/reactos/drivers/base/blue/blue.c Sun Dec 31 18:28:20 2006 @@ -801,6 +801,7 @@ DriverEntry (PDRIVER_OBJECT DriverObject, PUNICODE_STRING RegistryPath) { PDEVICE_OBJECT DeviceObject; + NTSTATUS Status; UNICODE_STRING DeviceName = RTL_CONSTANT_STRING(L"\\Device\\BlueScreen"); UNICODE_STRING SymlinkName = RTL_CONSTANT_STRING(L"\\??\\BlueScreen"); @@ -812,13 +813,18 @@ DriverObject->MajorFunction[IRP_MJ_WRITE] = ScrWrite; DriverObject->MajorFunction[IRP_MJ_DEVICE_CONTROL ] = ScrIoControl; - IoCreateDevice (DriverObject, - sizeof(DEVICE_EXTENSION), - &DeviceName, - FILE_DEVICE_SCREEN, - 0, - TRUE, - &DeviceObject); + Status = IoCreateDevice (DriverObject, + sizeof(DEVICE_EXTENSION), + &DeviceName, + FILE_DEVICE_SCREEN, + 0, + TRUE, + &DeviceObject); + + if (!NT_SUCCESS(Status)) + { + return Status; + } IoCreateSymbolicLink (&SymlinkName, &DeviceName);

1 0

[greatlrd] 25251: initate work of a CPUtranslator, example M68k to Intel. it is writen so not only M68k can be added. it does not work at all. it is a ground layout how I should code it.
by greatlrd＠svn.reactos.org 31 Dec '06

31 Dec '06

Author: greatlrd Date: Sun Dec 31 17:59:07 2006 New Revision: 25251 URL: http://svn.reactos.org/svn/reactos?rev=25251&view=rev Log: initate work of a CPUtranslator, example M68k to Intel. it is writen so not only M68k can be added. it does not work at all. it is a ground layout how I should code it. Added: trunk/rosapps/devutils/cputointel/ trunk/rosapps/devutils/cputointel/CpuToIntel.c (with props) trunk/rosapps/devutils/cputointel/cputointel.rbuild (with props) trunk/rosapps/devutils/cputointel/m68k/ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c (with props) trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h (with props) trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c (with props) trunk/rosapps/devutils/cputointel/m68k/m68k.h (with props) trunk/rosapps/devutils/cputointel/misc.c (with props) trunk/rosapps/devutils/cputointel/misc.h (with props) Added: trunk/rosapps/devutils/cputointel/CpuToIntel.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/CpuToI… ============================================================================== --- trunk/rosapps/devutils/cputointel/CpuToIntel.c (added) +++ trunk/rosapps/devutils/cputointel/CpuToIntel.c Sun Dec 31 17:59:07 2006 @@ -1,0 +1,27 @@ + + +#include <stdio.h> +#include "m68k/m68k.h" +#include "misc.h" + +int main(int argc, char * argv[]) +{ + printf("Usage :\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("--------------------------------------------------------------\n"); + printf(" -inBin filename : the bin file you whant convert\n"); + printf(" -OutAsm filename : the Asm file you whant create\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"); + + return 0; +} + Propchange: trunk/rosapps/devutils/cputointel/CpuToIntel.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/cputointel.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/cputoi… ============================================================================== --- trunk/rosapps/devutils/cputointel/cputointel.rbuild (added) +++ trunk/rosapps/devutils/cputointel/cputointel.rbuild Sun Dec 31 17:59:07 2006 @@ -1,0 +1,15 @@ +<module name="cputointel" type="win32cui" installbase="system32" installname="cputointel.exe" stdlib="host"> + <include base="cputointel">.</include> + <define name="__USE_W32API" /> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <library>user32</library> + + <file>CpuToIntel.c</file> + <file>misc.c</file> + + <file>m68k/M68kBrain.c</file> + <file>m68k/M68kopcode.c</file> + +</module> Propchange: trunk/rosapps/devutils/cputointel/cputointel.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c (added) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c Sun Dec 31 17:59:07 2006 @@ -1,0 +1,209 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "M68kBrain.h" +#include "m68k.h" +#include "../misc.h" + +/* retun + * 0 = Ok + * 1 = unimplemt + * 2 = Unkonwn Opcode + * 3 = can not open read file + * 4 = can not open write file + * 5 = can not seek to end of read file + * 6 = can not get the file size of the read file + * 7 = read file size is Zero + * 8 = can not alloc memory + * 9 = can not read file + */ + +CPU_INT M68KBrain(char *infileName, char *outputfileName, CPU_UNINT BaseAddress) +{ + FILE *infp; + FILE *outfp; + CPU_BYTE *cpu_buffer; + CPU_UNINT cpu_pos = 0; + CPU_UNINT cpu_oldpos; + CPU_UNINT cpu_size=0; + CPU_INT cpuint; + CPU_INT retcode = 0; + CPU_INT retsize; + + /* 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; + } + + 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))) + { + printf("error can not alloc %uld size for memory buffer",cpu_size); + fclose(infp); + fclose(outfp); + return 8; + } + + /* read from the file now in one sweep */ + fread(cpu_buffer,1,cpu_size,infp); + if (!ferror(infp)) + { + printf("error can not read file "); + fclose(infp); + fclose(outfp); + return 9; + } + fclose(infp); + + /* now we start the process */ + while (cpu_pos<cpu_size) + { + cpu_oldpos = cpu_pos; + + cpuint = cpu_buffer[cpu_pos]; + + /* Abcd */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Abcd))) == ConvertBitToByte(cpuint_table_Abcd)) + { + retsize = M68k_Abcd(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* Add */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Add))) == ConvertBitToByte(cpuint_table_Add)) + { + retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* Addi */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addi))) == ConvertBitToByte(cpuint_table_Addi)) + { + retsize = M68k_Addi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* Addq */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addq))) == ConvertBitToByte(cpuint_table_Addq)) + { + retsize = M68k_Addq(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* Addx */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Addx))) == ConvertBitToByte(cpuint_table_Addx)) + { + retsize = M68k_Addx(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* And */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_And))) == ConvertBitToByte(cpuint_table_And)) + { + retsize = M68k_Add(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* Andi */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_Andi))) == ConvertBitToByte(cpuint_table_Andi)) + { + retsize = M68k_Andi(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + /* AndToCCR */ + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_AndToCCRF))) == ConvertBitToByte(cpuint_table_AndToCCRF)) + { + cpuint = cpu_buffer[cpu_pos+1]; + if ((cpuint - (cpuint & GetMaskByte(cpuint_table_AndToCCRS))) == ConvertBitToByte(cpuint_table_AndToCCRS)) + { + cpu_pos++; + retsize = M68k_AndToCCR(outfp, cpu_buffer, cpu_pos, cpu_size, BaseAddress); + if (retsize<0) + retcode = 1; + else + cpu_pos += retsize; + } + else + { + cpuint = cpu_buffer[cpu_pos]; + } + } + + /* Found all Opcode and breakout and return no error found */ + if (cpu_pos >=cpu_size) + { + break; + } + + /* Check if we have found a cpu opcode */ + if (cpu_oldpos == cpu_pos) + { + if (retcode == 0) + { + /* no unimplement error where found so we return a msg for unknown opcode */ + printf("Unkonwn Opcode found at 0x%8x opcode 0x%2x\n",cpu_oldpos+BaseAddress,(unsigned int)cpu_buffer[cpu_oldpos]); + retcode = 2; + } + } + + /* Erorro Found ? */ + if (retcode!=0) + { + /* Erorro Found break and return the error code */ + break; + } + } + return retcode; +} Propchange: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h (added) +++ trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h Sun Dec 31 17:59:07 2006 @@ -1,0 +1,23 @@ + +#include "../misc.h" + +CPU_BYTE cpuint_table_Abcd[16] = {1,1,1,1,2,2,2,1,0,0,0,0,2,2,2,2}; +CPU_BYTE cpuint_table_Add[16] = {1,1,0,1,2,2,2,2,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_Addi[16] = {0,0,0,0,0,1,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_Addq[16] = {0,1,0,1,2,2,2,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_Addx[16] = {1,1,0,1,2,2,2,1,2,2,0,0,2,2,2,2}; +CPU_BYTE cpuint_table_And[16] = {1,1,0,0,2,2,2,2,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_Andi[16] = {0,0,0,0,0,0,1,0,2,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_AndToCCRF[16] = {0,0,0,0,0,0,1,0,0,0,1,1,1,1,0,0}; +CPU_BYTE cpuint_table_AndToCCRS[16] = {0,0,0,0,0,0,0,0,0,2,2,2,2,2,2,2}; +CPU_BYTE cpuint_table_Asl[16] = {1,1,1,0,2,2,2,0,2,2,2,0,0,2,2,2}; +CPU_BYTE cpuint_table_Asr[16] = {1,1,1,0,2,2,2,1,2,2,2,0,0,2,2,2}; + + +CPU_BYTE table_Rx[16] = {0,0,0,0,1,1,1,0,0,0,0,0,0,0,0,0}; +CPU_BYTE table_RM[16] = {0,0,0,0,0,0,0,0,0,0,0,0,1,0,0,0}; +CPU_BYTE table_Ry[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,1,1,1}; +CPU_BYTE table_Opmode[16] = {0,0,0,0,0,0,0,1,1,1,0,0,0,0,0,0}; +CPU_BYTE table_Mode[16] = {0,0,0,0,0,0,0,0,0,0,1,1,1,0,0,0}; +CPU_BYTE table_Size[16] = {0,0,0,0,0,0,0,0,1,1,0,0,0,0,0,0}; + Propchange: trunk/rosapps/devutils/cputointel/m68k/M68kBrain.h ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/M… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c (added) +++ trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c Sun Dec 31 17:59:07 2006 @@ -1,0 +1,150 @@ + +#include <stdio.h> +#include <stdlib.h> +#include "m68k.h" +#include "misc.h" + + +CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Abcd unimplement\n"); + return -1; +} + +CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + CPU_INT opmode; + CPU_INT mode; + CPU_INT Rx; + CPU_INT Ry; + //CPU_INT cpuint; + + opmode = ConvertBitToByte(table_Opmode); + mode = ConvertBitToByte(table_Mode); + Rx = ConvertBitToByte(table_Rx); + Ry = ConvertBitToByte(table_Ry); + + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + if (opmode == 0x00) + { + /* <ea> + Dn -> Dn */ + printf(";Add unimplement of \"<ea> + Dn -> Dn\" \n"); + + } + + if (opmode == 0x01) + { + /* <ea> + Dn -> Dn */ + printf(";Add unimplement of \"<ea> + Dn -> Dn\" \n"); + } + + if (opmode == 0x02) + { + /* <ea> + Dn -> Dn */ + printf(";Add unimplement of \"<ea> + Dn -> Dn\" \n"); + } + + if (opmode == 0x03) + { + /* <ea> + An -> An */ + printf(";Add unimplement of \"<ea> + An -> An\" \n"); + } + + if (opmode == 0x04) + { + /* Dn + <ea> -> <ea> */ + printf(";Add unimplement of \"Dn + <ea> -> <ea>\" \n"); + } + + if (opmode == 0x05) + { + /* Dn + <ea> -> <ea> */ + printf(";Add unimplement of \"Dn + <ea> -> <ea>\" \n"); + } + + if (opmode == 0x06) + { + /* Dn + <ea> -> <ea> */ + printf(";Add unimplement of \"Dn + <ea> -> <ea>\" \n"); + } + + if (opmode == 0x07) + { + /* <ea> + An -> An */ + printf(";Add unimplement of \"<ea> + An -> An\" \n"); + } + + + + + + return -1; +} + +CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Addi unimplement\n"); + return -1; +} + +CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Addq unimplement\n"); + return -1; +} + +CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Addx unimplement\n"); + return -1; +} + +CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";And unimplement\n"); + return -1; +} + +CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Andi unimplement\n"); + return -1; +} + +CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";AndToCCR unimplement\n"); + return -1; +} + +CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Asl unimplement\n"); + return -1; +} + +CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress) +{ + fprintf(out,"Line_0x%8x :\n",BaseAddress + cpu_pos); + + printf(";Asr unimplement\n"); + return -1; +} + Propchange: trunk/rosapps/devutils/cputointel/m68k/M68kopcode.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/rosapps/devutils/cputointel/m68k/m68k.h URL: http://svn.reactos.org/svn/reactos/trunk/rosapps/devutils/cputointel/m68k/m… ============================================================================== --- trunk/rosapps/devutils/cputointel/m68k/m68k.h (added) +++ trunk/rosapps/devutils/cputointel/m68k/m68k.h Sun Dec 31 17:59:07 2006 @@ -1,0 +1,20 @@ + +#include "../misc.h" + +CPU_INT M68k_Abcd(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Add(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Addi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Addq(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Addx(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_And(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Andi(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_AndToCCR(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Asl(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); +CPU_INT M68k_Asr(FILE *out, CPU_BYTE * cpu_buffer, CPU_UNINT cpu_pos, CPU_UNINT cpu_size, CPU_UNINT BaseAddress); + +extern CPU_BYTE table_Rx[16]; +extern CPU_BYTE table_RM[16]; +extern CPU_BYTE table_Ry[16]; +extern CPU_BYTE table_Opmode[16]; +extern CPU_BYTE table_Mode[16]; +extern CPU_BYTE table_Size[16]; Propchange: trunk/rosapps/devutils/cputointel/m68k/m68k.h ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rosapps/devutils/cputointel/misc.c Sun Dec 31 17:59:07 2006 @@ -1,0 +1,34 @@ + +#include <stdio.h> +#include "misc.h" + + +/* Conveting bit array to a int byte */ +CPU_UNINT ConvertBitToByte(CPU_BYTE *bit) +{ + CPU_UNINT Byte = 0; + CPU_UNINT t; + + for(t=15;t>0;t--) + { + if (bit[15-t] != 2) + Byte = Byte + (bit[15-t]<<t); + } + return Byte; +} + +/* Conveting bit array mask to a int byte mask */ +CPU_UNINT GetMaskByte(CPU_BYTE *bit) +{ + CPU_UNINT MaskByte = 0; + CPU_UNINT t; + + for(t=15;t>0;t--) + { + if (bit[15-t] == 2) + { + MaskByte = MaskByte + ( (bit[15-t]-1) <<t); + } + } + return MaskByte; +} Propchange: trunk/rosapps/devutils/cputointel/misc.c ------------------------------------------------------------------------------ svn:eol-style = native Added: 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 (added) +++ trunk/rosapps/devutils/cputointel/misc.h Sun Dec 31 17:59:07 2006 @@ -1,0 +1,14 @@ + +#define CPU_UNINT unsigned int +#define CPU_INT int + +#define CPU_BYTE unsigned char + +/* Prototypes for misc stuff */ + + +/* Convert Bit index to int */ +CPU_UNINT ConvertBitToByte(CPU_BYTE *bit); +CPU_UNINT GetMaskByte(CPU_BYTE *bit); + + Propchange: trunk/rosapps/devutils/cputointel/misc.h ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[tretiakov] 25250: Fix a typo
by tretiakov＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: tretiakov Date: Sun Dec 31 00:40:32 2006 New Revision: 25250 URL: http://svn.reactos.org/svn/reactos?rev=25250&view=rev Log: Fix a typo Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Sun Dec 31 00:40:32 2006 @@ -774,7 +774,7 @@ POINT pts[4]; pts[0].x = dc->w.CursPosX; pts[0].y = dc->w.CursPosY; - RtlCopyMemory(pts + 1, lppt, sizeof(POINT) * 3); + RtlCopyMemory(pts + 1, &lppt[i], sizeof(POINT) * 3); IntGdiPolyBezier(dc, pts, 4); i += 2; }

1 0

[tretiakov] 25249: Implement NtGdiPolyDraw (based on wine).
by tretiakov＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: tretiakov Date: Sat Dec 30 23:46:05 2006 New Revision: 25249 URL: http://svn.reactos.org/svn/reactos?rev=25249&view=rev Log: Implement NtGdiPolyDraw (based on wine). Modified: trunk/reactos/dll/win32/gdi32/gdi32.def trunk/reactos/dll/win32/gdi32/misc/stubs.c trunk/reactos/subsystems/win32/win32k/include/path.h trunk/reactos/subsystems/win32/win32k/objects/line.c Modified: trunk/reactos/dll/win32/gdi32/gdi32.def URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/gdi32.def?… ============================================================================== --- trunk/reactos/dll/win32/gdi32/gdi32.def (original) +++ trunk/reactos/dll/win32/gdi32/gdi32.def Sat Dec 30 23:46:05 2006 @@ -494,7 +494,7 @@ PlgBlt@40=NtGdiPlgBlt@40 PolyBezier@12=NtGdiPolyBezier@12 PolyBezierTo@12=NtGdiPolyBezierTo@12 -PolyDraw@16 +PolyDraw@16=NtGdiPolyDraw@16 PolyPolygon@16=NtGdiPolyPolygon@16 PolyPolyline@16=NtGdiPolyPolyline@16 PolyTextOutA@12 Modified: trunk/reactos/dll/win32/gdi32/misc/stubs.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/gdi32/misc/stubs… ============================================================================== --- trunk/reactos/dll/win32/gdi32/misc/stubs.c (original) +++ trunk/reactos/dll/win32/gdi32/misc/stubs.c Sat Dec 30 23:46:05 2006 @@ -781,24 +781,6 @@ UNIMPLEMENTED; SetLastError(ERROR_CALL_NOT_IMPLEMENTED); return 0; -} - - -/* - * @unimplemented - */ -BOOL -STDCALL -PolyDraw( - HDC hdc, - CONST POINT *a1, - CONST BYTE *a2, - int a3 - ) -{ - UNIMPLEMENTED; - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; } Modified: trunk/reactos/subsystems/win32/win32k/include/path.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/in… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/include/path.h (original) +++ trunk/reactos/subsystems/win32/win32k/include/path.h Sat Dec 30 23:46:05 2006 @@ -22,4 +22,6 @@ BOOL FASTCALL PATH_RoundRect(DC *dc, INT x1, INT y1, INT x2, INT y2, INT ell_width, INT ell_height); BOOL FASTCALL PATH_PathToRegion (GdiPath *pPath, INT nPolyFillMode, HRGN *pHrgn); +VOID FASTCALL IntGdiCloseFigure(PDC pDc); + #endif /* _WIN32K_PATH_H */ Modified: trunk/reactos/subsystems/win32/win32k/objects/line.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/ob… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/objects/line.c (original) +++ trunk/reactos/subsystems/win32/win32k/objects/line.c Sat Dec 30 23:46:05 2006 @@ -149,7 +149,6 @@ Pts = GDI_Bezier ( pt, Count, &nOut ); if ( Pts ) { - DbgPrint("Pts = %p, no = %d\n", Pts, nOut); ret = IntGdiPolyline(dc, Pts, nOut); ExFreePool(Pts); } @@ -729,12 +728,76 @@ APIENTRY NtGdiPolyDraw( IN HDC hdc, - IN LPPOINT ppt, - IN LPBYTE pjAttr, - IN ULONG cpt) -{ - UNIMPLEMENTED; - return FALSE; + IN LPPOINT lppt, + IN LPBYTE lpbTypes, + IN ULONG cCount) +{ + PDC dc; + BOOL result = FALSE; + POINT lastmove; + unsigned int i; + + dc = DC_LockDc(hdc); + if(!dc) return FALSE; + + _SEH_TRY + { + ProbeArrayForRead(lppt, sizeof(POINT), cCount, sizeof(LONG)); + ProbeArrayForRead(lpbTypes, sizeof(BYTE), cCount, sizeof(BYTE)); + + /* check for each bezierto if there are two more points */ + for( i = 0; i < cCount; i++ ) + if( lpbTypes[i] != PT_MOVETO && + lpbTypes[i] & PT_BEZIERTO ) + { + if( cCount < i+3 ) _SEH_LEAVE; + else i += 2; + } + + /* if no moveto occurs, we will close the figure here */ + lastmove.x = dc->w.CursPosX; + lastmove.y = dc->w.CursPosY; + + /* now let's draw */ + for( i = 0; i < cCount; i++ ) + { + if( lpbTypes[i] == PT_MOVETO ) + { + IntGdiMoveToEx( dc, lppt[i].x, lppt[i].y, NULL ); + lastmove.x = dc->w.CursPosX; + lastmove.y = dc->w.CursPosY; + } + else if( lpbTypes[i] & PT_LINETO ) + IntGdiLineTo( dc, lppt[i].x, lppt[i].y ); + else if( lpbTypes[i] & PT_BEZIERTO ) + { + POINT pts[4]; + pts[0].x = dc->w.CursPosX; + pts[0].y = dc->w.CursPosY; + RtlCopyMemory(pts + 1, lppt, sizeof(POINT) * 3); + IntGdiPolyBezier(dc, pts, 4); + i += 2; + } + else _SEH_LEAVE; + + if( lpbTypes[i] & PT_CLOSEFIGURE ) + { + if( PATH_IsPathOpen( dc->w.path ) ) IntGdiCloseFigure( dc ); + else IntGdiLineTo( dc, lastmove.x, lastmove.y ); + } + } + + result = TRUE; + } + _SEH_HANDLE + { + SetLastNtError(_SEH_GetExceptionCode()); + } + _SEH_END; + + DC_UnlockDc(dc); + + return result; } BOOL

1 0

[fireball] 25248: Comment out a call to GdiReleaseDC() since it spams debug log with unimplemented messages. I put up a FIXME so it gets uncommented once GdiReleaseDC() is implemented.
by fireball＠svn.reactos.org 30 Dec '06

30 Dec '06

Author: fireball Date: Sat Dec 30 14:04:20 2006 New Revision: 25248 URL: http://svn.reactos.org/svn/reactos?rev=25248&view=rev Log: Comment out a call to GdiReleaseDC() since it spams debug log with unimplemented messages. I put up a FIXME so it gets uncommented once GdiReleaseDC() is implemented. Modified: trunk/reactos/dll/win32/user32/windows/dc.c Modified: trunk/reactos/dll/win32/user32/windows/dc.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/user32/windows/d… ============================================================================== --- trunk/reactos/dll/win32/user32/windows/dc.c (original) +++ trunk/reactos/dll/win32/user32/windows/dc.c Sat Dec 30 14:04:20 2006 @@ -87,8 +87,9 @@ // if the DC was released return one. if (!hDC) return FALSE; // Null hDC return zero. - - GdiReleaseDC ( hDC ); // Release locals. + + // FIXME: Uncomment once GdiReleaseDC() is implemented + //GdiReleaseDC ( hDC ); // Release locals. // Win 3.1 throw back, hWnd should be ignored and not used. // Replace with NtUserCallOneParam ((DWORD) hDC, ONEPARAM_ROUTINE_RELEASEDC); return NtUserReleaseDC(hWnd, hDC);

1 0

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs December 2006