rpms/grub/devel grub-fedora-9.patch,1.11,1.12 grub.spec,1.73,1.74
Peter Jones (pjones)
fedora-extras-commits at redhat.com
Mon Apr 7 17:19:59 UTC 2008
Author: pjones
Update of /cvs/extras/rpms/grub/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv29176
Modified Files:
grub-fedora-9.patch grub.spec
Log Message:
* Mon Apr 07 2008 Peter Jones <pjones at redhat.com> - 0.97-33
- Rewrite ia32 efi call wrapper to make the makefile simpler.
grub-fedora-9.patch:
Index: grub-fedora-9.patch
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub-fedora-9.patch,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- grub-fedora-9.patch 1 Apr 2008 21:35:44 -0000 1.11
+++ grub-fedora-9.patch 7 Apr 2008 17:19:51 -0000 1.12
@@ -25009,141 +25009,141 @@
index 0000000..e69de29
diff --git a/efi/ia32/callwrap.c b/efi/ia32/callwrap.c
new file mode 100644
-index 0000000..cc7a8da
+index 0000000..56df899
--- /dev/null
+++ b/efi/ia32/callwrap.c
@@ -0,0 +1,131 @@
+
-+#define ENTRY(name) \
-+ ".globl " #name ";" \
-+ ".align 16;" \
-+ #name ":"
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call0)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $8, %%esp
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call1)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $20, %%esp
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call2)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $16, %%esp
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call3)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $12, %%esp
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call4)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $8, %%esp
-+ pushl 24(%%ebp)
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call5)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $20, %%esp
-+ pushl 28(%%ebp)
-+ pushl 24(%%ebp)
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_64_call5)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $12, %%esp
-+ pushl 36(%%ebp)
-+ pushl 32(%%ebp)
-+ pushl 28(%%ebp)
-+ pushl 24(%%ebp)
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call6)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $16, %%esp
-+ pushl 32(%%ebp)
-+ pushl 28(%%ebp)
-+ pushl 24(%%ebp)
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
-+
-+__asm__ __volatile__(
-+ENTRY(i386_call7)"
-+ pushl %%ebp
-+ movl %%esp,%%ebp
-+ subl $12, %%esp
-+ pushl 36(%%ebp)
-+ pushl 32(%%ebp)
-+ pushl 28(%%ebp)
-+ pushl 24(%%ebp)
-+ pushl 20(%%ebp)
-+ pushl 16(%%ebp)
-+ pushl 12(%%ebp)
-+ call *8(%%ebp)
-+ leave
-+ ret
-+ ");
++#define ENTRY(name) \
++ ".globl " #name ";" \
++ ".align 16;" \
++ #name ":"
++
++asm(
++ENTRY(i386_call0)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $8, %esp \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call1)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $20, %esp \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call2)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $16, %esp \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call3)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $12, %esp \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call4)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $8, %esp \n"
++ "pushl 24(%ebp) \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call5)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $20, %esp \n"
++ "pushl 28(%ebp) \n"
++ "pushl 24(%ebp) \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_64_call5)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $12, %esp \n"
++ "pushl 36(%ebp) \n"
++ "pushl 32(%ebp) \n"
++ "pushl 28(%ebp) \n"
++ "pushl 24(%ebp) \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++
++asm(
++ENTRY(i386_call6)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $16, %esp \n"
++ "pushl 32(%ebp) \n"
++ "pushl 28(%ebp) \n"
++ "pushl 24(%ebp) \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
++
++asm(
++ENTRY(i386_call7)
++ "pushl %ebp \n"
++ "movl %esp,%ebp \n"
++ "subl $12, %esp \n"
++ "pushl 36(%ebp) \n"
++ "pushl 32(%ebp) \n"
++ "pushl 28(%ebp) \n"
++ "pushl 24(%ebp) \n"
++ "pushl 20(%ebp) \n"
++ "pushl 16(%ebp) \n"
++ "pushl 12(%ebp) \n"
++ "call *8(%ebp) \n"
++ "leave \n"
++ "ret \n"
++ );
diff --git a/efi/ia32/loader/bin_to_h.c b/efi/ia32/loader/bin_to_h.c
new file mode 100644
index 0000000..4cff104
Index: grub.spec
===================================================================
RCS file: /cvs/extras/rpms/grub/devel/grub.spec,v
retrieving revision 1.73
retrieving revision 1.74
diff -u -r1.73 -r1.74
--- grub.spec 1 Apr 2008 21:35:44 -0000 1.73
+++ grub.spec 7 Apr 2008 17:19:51 -0000 1.74
@@ -1,6 +1,6 @@
Name: grub
Version: 0.97
-Release: 32%{?dist}
+Release: 33%{?dist}
Summary: GRUB - the Grand Unified Boot Loader.
Group: System Environment/Base
License: GPLv2+
@@ -89,6 +89,9 @@
%{_datadir}/grub
%changelog
+* Mon Apr 07 2008 Peter Jones <pjones at redhat.com> - 0.97-33
+- Rewrite ia32 efi call wrapper to make the makefile simpler.
+
* Tue Apr 01 2008 Peter Jones <pjones at redhat.com> - 0.97-32
- Add graphics debug mode
- Fix screen geometry variable passing
More information about the fedora-extras-commits
mailing list