Rename 'bios_jmp' to 'bios16_jmp' to make it clear what it's related to.

This commit is contained in:
Mike Smith 1999-08-25 06:56:37 +00:00
parent 857c0cefe0
commit 68b7d21a4a
3 changed files with 10 additions and 10 deletions

View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: bios.c,v 1.19 1999/08/24 16:42:08 msmith Exp $ * $Id: bios.c,v 1.20 1999/08/25 06:44:32 peter Exp $
*/ */
/* /*
@ -287,7 +287,7 @@ set_bios_selectors(struct bios_segments *seg, int flags)
} }
extern int vm86pa; extern int vm86pa;
extern void bios_jmp(void); extern void bios16_jmp(void);
/* /*
* this routine is really greedy with selectors, and uses 5: * this routine is really greedy with selectors, and uses 5:
@ -366,7 +366,7 @@ bios16(struct bios_args *args, char *fmt, ...)
args->seg.args.limit = 0xffff; args->seg.args.limit = 0xffff;
} }
args->seg.code32.base = (u_int)&bios_jmp & PG_FRAME; args->seg.code32.base = (u_int)&bios16_jmp & PG_FRAME;
args->seg.code32.limit = 0xffff; args->seg.code32.limit = 0xffff;
ptd = (u_int *)rcr3(); ptd = (u_int *)rcr3();

View File

@ -24,7 +24,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: bios.c,v 1.19 1999/08/24 16:42:08 msmith Exp $ * $Id: bios.c,v 1.20 1999/08/25 06:44:32 peter Exp $
*/ */
/* /*
@ -287,7 +287,7 @@ set_bios_selectors(struct bios_segments *seg, int flags)
} }
extern int vm86pa; extern int vm86pa;
extern void bios_jmp(void); extern void bios16_jmp(void);
/* /*
* this routine is really greedy with selectors, and uses 5: * this routine is really greedy with selectors, and uses 5:
@ -366,7 +366,7 @@ bios16(struct bios_args *args, char *fmt, ...)
args->seg.args.limit = 0xffff; args->seg.args.limit = 0xffff;
} }
args->seg.code32.base = (u_int)&bios_jmp & PG_FRAME; args->seg.code32.base = (u_int)&bios16_jmp & PG_FRAME;
args->seg.code32.limit = 0xffff; args->seg.code32.limit = 0xffff;
ptd = (u_int *)rcr3(); ptd = (u_int *)rcr3();

View File

@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: bioscall.s,v 1.3 1999/07/29 07:10:34 msmith Exp $ * $Id: bioscall.s,v 1.4 1999/08/25 06:44:32 peter Exp $
*/ */
/* /*
@ -123,12 +123,12 @@ ENTRY(bios16_call)
movl 20(%ebp),%edi movl 20(%ebp),%edi
pushl $BC32SEL pushl $BC32SEL
leal CNAME(bios_jmp),%ebp leal CNAME(bios16_jmp),%ebp
andl $PAGE_MASK,%ebp andl $PAGE_MASK,%ebp
pushl %ebp /* reload %cs and */ pushl %ebp /* reload %cs and */
lret /* ...continue below */ lret /* ...continue below */
.globl CNAME(bios_jmp) .globl CNAME(bios16_jmp)
CNAME(bios_jmp): CNAME(bios16_jmp):
data16 data16
lcall _bioscall_vector /* 16-bit call */ lcall _bioscall_vector /* 16-bit call */