OK, fixed the problem with the intrin.h header that doesn't exist in previous versions of VS... -------------- next part -------------- An embedded and charset-unspecified text was scrubbed... Name: JIT.patch URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20060126/7e55b0d0/attachment.ksh>
Hi Morten, If you can make the VS2005 project files availiable on the net then I can test them as I have VS2005 now, so then with Chris'es okay then they could be distributed with LLVM. Thanks, Aaron ----- Original Message ----- From: "Morten Ofstad" <morten at hue.no> To: "LLVM Developers Mailing List" <llvmdev at cs.uiuc.edu> Sent: Thursday, January 26, 2006 3:31 PM Subject: [LLVMdev] VS2005 patch> OK, fixed the problem with the intrin.h header that doesn't exist in > previous versions of VS... >--------------------------------------------------------------------------------> Index: lib/Target/X86/X86JITInfo.cpp > ==================================================================> RCS file: /var/cvs/llvm/llvm/lib/Target/X86/X86JITInfo.cpp,v > retrieving revision 1.14 > diff -u -r1.14 X86JITInfo.cpp > --- lib/Target/X86/X86JITInfo.cpp 22 Jul 2005 20:49:37 -0000 1.14 > +++ lib/Target/X86/X86JITInfo.cpp 26 Jan 2006 15:28:54 -0000 > @@ -20,6 +20,11 @@ > #include <iostream> > using namespace llvm; > > +#ifdef _MSC_VER > + extern "C" void *_AddressOfReturnAddress(void); > + #pragma intrinsic(_AddressOfReturnAddress) > +#endif > + > void X86JITInfo::replaceMachineCodeForFunction(void *Old, void *New) { > unsigned char *OldByte = (unsigned char *)Old; > *OldByte++ = 0xE9; // Emit JMP opcode. > @@ -64,9 +69,6 @@ > "popl %ebp\n" > "ret\n"); > #else > - extern "C" void *_AddressOfReturnAddress(void); > - #pragma intrinsic(_AddressOfReturnAddress) > - > void X86CompilationCallback2(void); > > _declspec(naked) void X86CompilationCallback(void) { >--------------------------------------------------------------------------------> _______________________________________________ > LLVM Developers mailing list > LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev >-------------------------------------------------------------------------------- No virus found in this incoming message. Checked by AVG Free Edition. Version: 7.1.375 / Virus Database: 267.14.22/239 - Release Date: 24/01/2006
The project files need frequent updating. I cannot maintain VS2005 project files, so while they could be distributed with LLVM, they will become broken fast. Also, VS2003 and VS2005 project and solution files cannot coexist in the same directories, further complicating matters. Aaron Gray wrote:> Hi Morten, > > If you can make the VS2005 project files availiable on the net then I > can test them as I have VS2005 now, so then with Chris'es okay then > they could be distributed with LLVM. > > Thanks, > > Aaron > > ----- Original Message ----- From: "Morten Ofstad" <morten at hue.no> > To: "LLVM Developers Mailing List" <llvmdev at cs.uiuc.edu> > Sent: Thursday, January 26, 2006 3:31 PM > Subject: [LLVMdev] VS2005 patch > > >> OK, fixed the problem with the intrin.h header that doesn't exist in >> previous versions of VS... >> > > > -------------------------------------------------------------------------------- > > > >> Index: lib/Target/X86/X86JITInfo.cpp >> ==================================================================>> RCS file: /var/cvs/llvm/llvm/lib/Target/X86/X86JITInfo.cpp,v >> retrieving revision 1.14 >> diff -u -r1.14 X86JITInfo.cpp >> --- lib/Target/X86/X86JITInfo.cpp 22 Jul 2005 20:49:37 -0000 1.14 >> +++ lib/Target/X86/X86JITInfo.cpp 26 Jan 2006 15:28:54 -0000 >> @@ -20,6 +20,11 @@ >> #include <iostream> >> using namespace llvm; >> >> +#ifdef _MSC_VER >> + extern "C" void *_AddressOfReturnAddress(void); >> + #pragma intrinsic(_AddressOfReturnAddress) >> +#endif >> + >> void X86JITInfo::replaceMachineCodeForFunction(void *Old, void *New) { >> unsigned char *OldByte = (unsigned char *)Old; >> *OldByte++ = 0xE9; // Emit JMP opcode. >> @@ -64,9 +69,6 @@ >> "popl %ebp\n" >> "ret\n"); >> #else >> - extern "C" void *_AddressOfReturnAddress(void); >> - #pragma intrinsic(_AddressOfReturnAddress) >> - >> void X86CompilationCallback2(void); >> >> _declspec(naked) void X86CompilationCallback(void) { >> > > > -------------------------------------------------------------------------------- > > > >> _______________________________________________ >> LLVM Developers mailing list >> LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu >> http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev >> > > > -------------------------------------------------------------------------------- > > > > No virus found in this incoming message. > Checked by AVG Free Edition. > Version: 7.1.375 / Virus Database: 267.14.22/239 - Release Date: > 24/01/2006 > > _______________________________________________ > LLVM Developers mailing list > LLVMdev at cs.uiuc.edu http://llvm.cs.uiuc.edu > http://lists.cs.uiuc.edu/mailman/listinfo/llvmdev > > >
On Thu, 26 Jan 2006, Morten Ofstad wrote:> OK, fixed the problem with the intrin.h header that doesn't exist in previous > versions of VS...applied, thanks! http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031225.html -Chris -- http://nondot.org/sabre/ http://llvm.org/
Remaining patches applied: http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031235.html http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031236.html http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031239.html http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031238.html http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031237.html Chris Lattner wrote:> On Thu, 26 Jan 2006, Morten Ofstad wrote: > >> OK, fixed the problem with the intrin.h header that doesn't exist in >> previous versions of VS... > > > applied, thanks! > http://lists.cs.uiuc.edu/pipermail/llvm-commits/Week-of-Mon-20060123/031225.html > > > -Chris >