Zachary Amsden wrote: > Add 5-argument handling for paravirt ops patching of PAE functions. > > Signed-off-by: Zachary Amsden <zach@xxxxxxxxxx> > > diff -r dbe11208916f include/asm-i386/paravirt.h > --- a/include/asm-i386/paravirt.h Thu Apr 19 11:40:55 2007 -0700 > +++ b/include/asm-i386/paravirt.h Thu Apr 19 12:04:16 2007 -0700 > @@ -308,10 +308,9 @@ unsigned paravirt_patch_insns(void *site > * return value handling from within these macros. This is fairly > * cumbersome. > * > - * There are 5 sets of PVOP_* macros for dealing with 0-4 arguments. > - * It could be extended to more arguments, but there would be little > - * to be gained from that. For each number of arguments, there are > - * the two VCALL and CALL variants for void and non-void functions. > + * There are 5 sets of PVOP_* macros for dealing with 0-5 arguments. > + * For each number of arguments, there are the two VCALL and CALL > + * variants for void and non-void functions. > * > * When there is a return value, the invoker of the macro must specify > * the return type. The macro then uses sizeof() on that type to > @@ -405,6 +404,21 @@ unsigned paravirt_patch_insns(void *site > "0" ((u32)(arg1)), "1" ((u32)(arg2)), \ > "2" ((u32)(arg3)), [_arg4] "mr" ((u32)(arg4))) > > +#define PVOP_CALL5(rettype, op, arg1, arg2, arg3, arg4, arg5) \ > + __PVOP_CALL(rettype, op, \ > + "push %[_arg5]; push %[_arg4];", \ > + "lea 8(%%esp),%%esp;", \ > + "0" ((u32)(arg1)), "1" ((u32)(arg2)), \ > + "2" ((u32)(arg3)), [_arg4] "mr" ((u32)(arg4)), \ > + [_arg5] "mr" ((u32)(arg5))) > Won't work if arg4 is a stack-relative addressing mode. That was the main reason I avoided 5-arg patching. I guess using "r" as the arg4 constraint would work, but register pressure is getting pretty tight. J _______________________________________________ Virtualization mailing list Virtualization@xxxxxxxxxxxxxxxxxxxxxxxxxx https://lists.linux-foundation.org/mailman/listinfo/virtualization