Skip to content

L
linux
Commit 3579bc6f authored by Linus Torvalds's avatar Linus Torvalds
Browse files
Options

[PATCH] Linux-0.99.9 (April 23, 1993) 

Bill's math emulator now passes paranoia.

Last argument to ioctl is "long".

sys_clone() appears.

[original announcement below]

The latest kernel release is 0.99.9, and can be found on nic.funet.fi:
pub/OS/Linux/PEOPLE/Linus, both as patches relative to pl8 and as full
sources.  The only major new feature is that the ST-0x driver has
finally been updated to the scatter-gather code: ST-0x users should with
luck get about 5 times the performance on disk-operations..  Seagate
code written by Drew Eckhardt.

0.99.9 also fixes:
- the FPU-emulator should now handle all rounding-modes correctly, and
  pass all the paranoia package tests.  Patches by Bill Metzenthen.
- bootup enhancements by Chrisoph Niemann (but the SVGA mode numbers
  have changed, so you may have to edit your lilo configuration file
  and/or the main Makefile to get the mode you normally want)
- ext2fs updated to the very latest release.  Code by Remy Card and
  Stephen Tweedie.
- various minor patches, some of them cosmetic, some of them fixes to
  smaller bugs..  Thanks to everybody who sent them in (even though not
  all made it)

It might be a good idea to test it all out,

            Linus
parent a2858ced
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 3269 additions and 1814 deletions
Makefile
View file @ 3579bc6f
......@@ -68,7 +68,7 @@ KEYBOARD = -DKBD_FINNISH -DKBDFLAGS=0
# The number is the same as you would ordinarily press at bootup.
#
SVGA_MODE= -DSVGA_MODE=1
SVGA_MODE= -DSVGA_MODE=3
#
# standard CFLAGS
......@@ -139,7 +139,7 @@ tools/./version.h: tools/version.h
tools/version.h: $(CONFIGURE) Makefile
@./makever.sh
@echo \#define UTS_RELEASE \"0.99.pl8-`cat .version`\" > tools/version.h
@echo \#define UTS_RELEASE \"0.99.pl9-`cat .version`\" > tools/version.h
@echo \#define UTS_VERSION \"`date +%D`\" >> tools/version.h
@echo \#define LINUX_COMPILE_TIME \"`date +%T`\" >> tools/version.h
@echo \#define LINUX_COMPILE_BY \"`whoami`\" >> tools/version.h
......
boot/setup.S
View file @ 3579bc6f
This diff is collapsed.
fs/ext2/Makefile
View file @ 3579bc6f
......@@ -14,8 +14,8 @@
.s.o:
$(AS) -o $*.o $<
OBJS= balloc.o bitmap.o dcache.o dir.o file.o ialloc.o inode.o \
namei.o symlink.o truncate.o
OBJS= acl.o balloc.o bitmap.o dcache.o dir.o file.o ialloc.o inode.o \
ioctl.o namei.o symlink.o truncate.o
ext2.o: $(OBJS)
$(LD) -r -o ext2.o $(OBJS)
......
fs/ext2/acl.c 0 → 100644
View file @ 3579bc6f
/*
* linux/fs/ext2/acl.c
*
* Copyright (C) 1993 Remy Card (card@masi.ibp.fr)
*/
/*
* This file will contain the Access Control Lists management for the
* second extended file system.
*/
#include <linux/sched.h>
#include <linux/ext2_fs.h>
#include <linux/errno.h>
/*
* ext2_permission ()
*
* Check for access rights
*/
int ext2_permission (struct inode * inode, int mask)
{
int mode = inode->i_mode;
/* Special case, access is always granted for root */
if (suser ())
return 1;
/* If no ACL, checks using the file mode */
else if (current->euid == inode->i_uid)
mode >>= 6;
else if (in_group_p (inode->i_gid))
mode >>= 3;
if (((mode & mask & 0007) == mask))
return 1;
else
return 0;
}
fs/ext2/balloc.c
View file @ 3579bc6f
......@@ -38,31 +38,32 @@
:"a" (0), "c" (size/4), "D" ((long) (addr)) \
:"cx", "di")
static inline int find_first_zero_bit(unsigned *addr, unsigned size)
static inline int find_first_zero_bit (unsigned *addr, unsigned size)
{
int res;
if (!size)
return 0;
__asm__("
cld
movl $-1,%%eax
repe; scasl
je 1f
subl $4,%%edi
movl (%%edi),%%eax
notl %%eax
bsfl %%eax,%%edx
jmp 2f
1: xorl %%edx,%%edx
2: subl %%ebx,%%edi
shll $3,%%edi
addl %%edi,%%edx"
:"=d" (res):"c" ((size+31)>>5), "D" (addr), "b" (addr)
:"ax", "bx", "cx", "di");
cld
movl $-1,%%eax
repe; scasl
je 1f
subl $4,%%edi
movl (%%edi),%%eax
notl %%eax
bsfl %%eax,%%edx
jmp 2f
1: xorl %%edx,%%edx
2: subl %%ebx,%%edi
shll $3,%%edi
addl %%edi,%%edx"
:"=d" (res)
:"c" ((size+31)>>5), "D" (addr), "b" (addr)
:"ax", "bx", "cx", "di");
return res;
}
static inline int find_next_zero_bit(unsigned *addr, int size, int offset)
static inline int find_next_zero_bit (unsigned * addr, int size, int offset)
{
unsigned *p = ((unsigned *) addr) + (offset >> 5);
int set = 0, bit = offset & 31, res;
......@@ -70,32 +71,37 @@ static inline int find_next_zero_bit(unsigned *addr, int size, int offset)
if (bit) {
/* Look for zero in first byte */
__asm__("
bsfl %1,%0
jne 1f
movl $32, %0
1: " : "=r" (set) : "r" (~(*p >> bit)));
if (set < (32-bit))
bsfl %1,%0
jne 1f
movl $32, %0
1: "
: "=r" (set)
: "r" (~(*p >> bit)));
if (set < (32 - bit))
return set + offset;
set = 32-bit;
set = 32 - bit;
p++;
}
/* No zero yet, search remaining full bytes for a zero */
res = find_first_zero_bit(p, size-32*(p-addr));
res = find_first_zero_bit (p, size - 32 * (p - addr));
return (offset + set + res);
}
static inline char * find_first_zero_byte(char *addr,int size)
static inline char * find_first_zero_byte (char * addr, int size)
{
char *res;
if (!size)
return 0;
__asm__("
cld
mov $0,%%eax
repnz; scasb
jnz 1f
dec %%edi
1: " : "=D" (res) : "0" (addr), "c" (size) : "ax");
cld
mov $0,%%eax
repnz; scasb
jnz 1f
dec %%edi
1: "
: "=D" (res)
: "0" (addr), "c" (size)
: "ax");
return res;
}
......@@ -155,8 +161,8 @@ static int load__block_bitmap (struct super_block * sb,
if (sb->u.ext2_sb.s_groups_count <= EXT2_MAX_GROUP_LOADED) {
if (sb->u.ext2_sb.s_block_bitmap[block_group]) {
if (sb->u.ext2_sb.s_block_bitmap_number[block_group]
!= block_group)
if (sb->u.ext2_sb.s_block_bitmap_number[block_group] !=
block_group)
panic ("load_block_bitmap: "
"block_group != block_bitmap_number");
else
......@@ -189,7 +195,7 @@ static int load__block_bitmap (struct super_block * sb,
else
brelse (sb->u.ext2_sb.s_block_bitmap
[EXT2_MAX_GROUP_LOADED - 1]);
for (j = sb->u.ext2_sb.s_loaded_block_bitmaps-1; j>0; j--) {
for (j = sb->u.ext2_sb.s_loaded_block_bitmaps - 1; j > 0; j--) {
sb->u.ext2_sb.s_block_bitmap_number[j] =
sb->u.ext2_sb.s_block_bitmap_number[j - 1];
sb->u.ext2_sb.s_block_bitmap[j] =
......@@ -337,14 +343,12 @@ int ext2_new_block (struct super_block * sb, unsigned long goal)
bitmap_nr = load_block_bitmap (sb, i);
bh = sb->u.ext2_sb.s_block_bitmap[bitmap_nr];
if (!bh) {
printk ("Cannot load bitmap_nr %d.\n",
bitmap_nr);
printk ("Cannot load bitmap_nr %d.\n", bitmap_nr);
unlock_super (sb);
return 0;
}
#ifdef EXT2FS_DEBUG
printk ("goal is at %d[%d,%d]:%d.\n",
i, group_desc, desc, j);
printk ("goal is at %d[%d,%d]:%d.\n", i, group_desc, desc, j);
#endif
if (!test_bit(j, bh->b_data)) {
#ifdef EXT2FS_DEBUG
......@@ -356,14 +360,18 @@ int ext2_new_block (struct super_block * sb, unsigned long goal)
if (j) {
/* The goal was occupied; search forward for a free
block within the next 32 blocks */
lmap = (((((unsigned long *) bh->b_data)[j >> 5])
>> ((j&31)+1)) |
((((unsigned long *) bh->b_data)[(j>>5)+1])
<<(31-(j&31))));
lmap = ((((unsigned long *) bh->b_data)[j >> 5]) >>
((j & 31) + 1));
if (j < EXT2_BLOCKS_PER_GROUP(sb) - 32)
lmap |= (((unsigned long *) bh->b_data)[(j >> 5) + 1]) <<
(31 - (j & 31));
else
lmap |= 0xffffffff << (31 - (j & 31));
if (lmap != 0xffffffffl) {
__asm__ ("bsfl %1,%0" :
"=r" (k) :
"r" (~lmap)); k++;
__asm__ ("bsfl %1,%0"
: "=r" (k)
: "r" (~lmap));
k++;
if ((j + k) < EXT2_BLOCKS_PER_GROUP(sb)) {
j += k;
goto got_block;
......@@ -381,9 +389,9 @@ int ext2_new_block (struct super_block * sb, unsigned long goal)
Search first in the remainder of the current group; then,
cyclicly search throught the rest of the groups. */
p = ((char *) bh->b_data) + (j>>3);
p = ((char *) bh->b_data) + (j >> 3);
r = find_first_zero_byte (p,
(EXT2_BLOCKS_PER_GROUP(sb)-j+7)>>3);
(EXT2_BLOCKS_PER_GROUP(sb) - j + 7) >> 3);
k = (r - ((char *) bh->b_data)) << 3;
if (k < EXT2_BLOCKS_PER_GROUP(sb)) {
j = k;
......@@ -440,7 +448,7 @@ int ext2_new_block (struct super_block * sb, unsigned long goal)
}
r = find_first_zero_byte (bh->b_data,
EXT2_BLOCKS_PER_GROUP(sb) >> 3);
j = (r-bh->b_data) << 3;
j = (r - bh->b_data) << 3;
if (j >= EXT2_BLOCKS_PER_GROUP(sb))
j = find_first_zero_bit ((unsigned long *) bh->b_data,
EXT2_BLOCKS_PER_GROUP(sb));
......@@ -466,8 +474,7 @@ int ext2_new_block (struct super_block * sb, unsigned long goal)
#ifdef EXT2FS_DEBUG
printk ("ext2_new_block: found bit %d\n", j);
#endif
j += i * EXT2_BLOCKS_PER_GROUP(sb) +
sb->u.ext2_sb.s_first_data_block;
j += i * EXT2_BLOCKS_PER_GROUP(sb) + sb->u.ext2_sb.s_first_data_block;
if (j >= sb->u.ext2_sb.s_blocks_count) {
printk ("block_group = %d,block=%d\n", i, j);
printk ("ext2_new_block: block >= blocks count");
......
fs/ext2/bitmap.c
View file @ 3579bc6f
......@@ -6,6 +6,9 @@
#include <linux/sched.h>
#include <linux/fs.h>
#include <linux/ext2_fs.h>
#ifdef EXT2FS_DEBUG
static int nibblemap[] = {4, 3, 3, 2, 3, 2, 2, 1, 3, 2, 2, 1, 2, 1, 1, 0};
......@@ -21,3 +24,5 @@ unsigned long ext2_count_free (struct buffer_head * map, unsigned numchars)
nibblemap[(map->b_data[i] >> 4) & 0xf];
return (sum);
}
#endif
fs/ext2/dir.c
View file @ 3579bc6f
......@@ -37,7 +37,7 @@ static struct file_operations ext2_dir_operations = {
NULL, /* write - bad */
ext2_readdir, /* readdir */
NULL, /* select - default */
NULL, /* ioctl - default */
ext2_ioctl, /* ioctl */
NULL, /* mmap */
NULL, /* no special open code */
NULL, /* no special release code */
......@@ -61,8 +61,8 @@ struct inode_operations ext2_dir_inode_operations = {
NULL, /* readlink */
NULL, /* follow_link */
NULL, /* bmap */
ext2_truncate, /* truncate */
NULL /* permission */
ext2_truncate, /* truncate */
ext2_permission /* permission */
};
int ext2_check_dir_entry (char * function, struct inode * dir,
......@@ -93,17 +93,17 @@ int ext2_check_dir_entry (char * function, struct inode * dir,
static int ext2_readdir (struct inode * inode, struct file * filp,
struct dirent * dirent, int count)
{
unsigned int offset, i;
unsigned int offset, i, err;
struct buffer_head * bh;
struct ext2_dir_entry * de;
struct super_block * sb;
if (!inode || !S_ISDIR(inode->i_mode))
return -EBADF;
sb = inode->i_sb;
while (filp->f_pos < inode->i_size) {
offset = filp->f_pos & (sb->s_blocksize - 1);
bh = ext2_bread (inode, (filp->f_pos) >> EXT2_BLOCK_SIZE_BITS(sb), 0);
bh = ext2_bread (inode, (filp->f_pos) >> EXT2_BLOCK_SIZE_BITS(sb), 0, &err);
if (!bh) {
filp->f_pos += sb->s_blocksize - offset;
continue;
......
fs/ext2/file.c
View file @ 3579bc6f
......@@ -44,7 +44,7 @@ static struct file_operations ext2_file_operations = {
ext2_file_write, /* write */
NULL, /* readdir - bad */
NULL, /* select - default */
NULL, /* ioctl - default */
ext2_ioctl, /* ioctl - default */
NULL, /* mmap */
NULL, /* no special open is needed */
NULL, /* release */
......@@ -66,7 +66,7 @@ struct inode_operations ext2_file_inode_operations = {
NULL, /* follow_link */
ext2_bmap, /* bmap */
ext2_truncate, /* truncate */
NULL /* permission */
ext2_permission /* permission */
};
/* static */ int ext2_file_read (struct inode * inode, struct file * filp,
......@@ -79,7 +79,7 @@ struct inode_operations ext2_file_inode_operations = {
struct buffer_head * bhreq[NBUF];
struct buffer_head * buflist[NBUF];
struct super_block * sb;
unsigned int size;
unsigned int size, err;
if (!inode) {
printk ("ext2_file_read: inode = NULL\n");
......@@ -127,7 +127,7 @@ struct inode_operations ext2_file_inode_operations = {
uptodate = 1;
while (blocks) {
--blocks;
*bhb = ext2_getblk (inode, block++, 0);
*bhb = ext2_getblk (inode, block++, 0, &err);
if (*bhb && !(*bhb)->b_uptodate) {
uptodate = 0;
bhreq[bhrequest++] = *bhb;
......@@ -203,6 +203,7 @@ static int ext2_file_write (struct inode * inode, struct file * filp,
struct buffer_head * bh;
char * p;
struct super_block * sb;
int err;
if (!inode) {
printk("ext2_file_write: inode = NULL\n");
......@@ -223,13 +224,13 @@ static int ext2_file_write (struct inode * inode, struct file * filp,
pos = filp->f_pos;
written = 0;
while (written < count) {
bh = ext2_getblk (inode, pos / sb->s_blocksize, 1);
bh = ext2_getblk (inode, pos / sb->s_blocksize, 1, &err);
if (!bh) {
#ifdef EXT2FS_DEBUG
printk ("ext2_file_write: ext2_getblk returned NULL\n");
#endif
if (!written)
written = -ENOSPC;
written = err;
break;
}
c = sb->s_blocksize - (pos % sb->s_blocksize);
......
fs/ext2/ialloc.c
View file @ 3579bc6f
......@@ -32,27 +32,28 @@
#include <asm/bitops.h>
static inline int find_first_zero_bit(unsigned *addr, unsigned size)
static inline int find_first_zero_bit(unsigned * addr, unsigned size)
{
int res;
if (!size)
return 0;
__asm__("
cld
movl $-1,%%eax
repe; scasl
je 1f
subl $4,%%edi
movl (%%edi),%%eax
notl %%eax
bsfl %%eax,%%edx
jmp 2f
1: xorl %%edx,%%edx
2: subl %%ebx,%%edi
shll $3,%%edi
addl %%edi,%%edx"
:"=d" (res):"c" ((size+31)>>5), "D" (addr), "b" (addr)
:"ax", "bx", "cx", "di");
cld
movl $-1,%%eax
repe; scasl
je 1f
subl $4,%%edi
movl (%%edi),%%eax
notl %%eax
bsfl %%eax,%%edx
jmp 2f
1: xorl %%edx,%%edx
2: subl %%ebx,%%edi
shll $3,%%edi
addl %%edi,%%edx"
: "=d" (res)
:"c" ((size + 31) >> 5), "D" (addr), "b" (addr)
: "ax", "bx", "cx", "di");
return res;
}
......@@ -289,17 +290,16 @@ static void inc_inode_version (struct inode * inode,
EXT2_INODES_PER_GROUP(inode->i_sb)) %
EXT2_INODES_PER_BLOCK(inode->i_sb));
raw_inode->i_version++;
if (!S_ISFIFO(mode))
inode->u.ext2_i.i_version = raw_inode->i_version;
inode->u.ext2_i.i_version = raw_inode->i_version;
bh->b_dirt = 1;
brelse (bh);
}
static struct ext2_group_desc *
get_group_desc(struct super_block *sb, int group)
static struct ext2_group_desc * get_group_desc(struct super_block * sb,
int group)
{
struct ext2_group_desc * gdp;
if (group >= sb->u.ext2_sb.s_groups_count || group < 0 )
if (group >= sb->u.ext2_sb.s_groups_count || group < 0 )
panic ("ext2: get_group_desc: Invalid group\n");
if (!sb->u.ext2_sb.s_group_desc[group / EXT2_DESC_PER_BLOCK(sb)])
panic ("ext2: get_group_desc: Descriptor not loaded");
......@@ -340,7 +340,7 @@ struct inode * ext2_new_inode (const struct inode * dir, int mode)
gdp = NULL; i=0;
if (S_ISDIR(mode)) {
avefreei = es->s_free_inodes_count /
avefreei = es->s_free_inodes_count /
sb->u.ext2_sb.s_groups_count;
/* I am not yet convinced that this next bit is necessary.
i = dir->u.ext2_i.i_block_group;
......@@ -377,11 +377,11 @@ struct inode * ext2_new_inode (const struct inode * dir, int mode)
gdp = tmp;
else
{ /* Use a quadratic hash to find a group with a free inode */
for (j=1; j<sb->u.ext2_sb.s_groups_count; j<<=1) {
i+=j;
if (i>=sb->u.ext2_sb.s_groups_count)
i-=sb->u.ext2_sb.s_groups_count;
tmp = get_group_desc(sb,i);
for (j = 1; j < sb->u.ext2_sb.s_groups_count; j <<= 1) {
i += j;
if (i >= sb->u.ext2_sb.s_groups_count)
i -= sb->u.ext2_sb.s_groups_count;
tmp = get_group_desc(sb, i);
if (tmp->bg_free_inodes_count) {
gdp = tmp;
break;
......@@ -391,9 +391,9 @@ struct inode * ext2_new_inode (const struct inode * dir, int mode)
if (!gdp) {
/* That failed: try linear search for a free inode */
i = dir->u.ext2_i.i_block_group + 2;
for (j=2; j<sb->u.ext2_sb.s_groups_count; j++) {
if (++i > sb->u.ext2_sb.s_groups_count)
i=0;
for (j = 2; j < sb->u.ext2_sb.s_groups_count; j++) {
if (++i >= sb->u.ext2_sb.s_groups_count)
i = 0;
tmp = get_group_desc(sb,i);
if (tmp->bg_free_inodes_count) {
gdp = tmp;
......@@ -454,8 +454,7 @@ struct inode * ext2_new_inode (const struct inode * dir, int mode)
inode->u.ext2_i.i_file_acl = 0;
inode->u.ext2_i.i_dir_acl = 0;
inode->u.ext2_i.i_dtime = 0;
if (!S_ISFIFO(mode))
inode->u.ext2_i.i_block_group = i;
inode->u.ext2_i.i_block_group = i;
inode->i_op = NULL;
inc_inode_version (inode, gdp, mode);
#ifdef EXT2FS_DEBUG
......
fs/ext2/inode.c
View file @ 3579bc6f
This diff is collapsed.
fs/ext2/ioctl.c 0 → 100644
View file @ 3579bc6f
/*
* linux/fs/ext2/ioctl.c
*
* Copyright (C) 1993 Remy Card (card@masi.ibp.fr)
*/
#include <linux/sched.h>
#include <linux/errno.h>
#include <linux/ext2_fs.h>
int ext2_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
unsigned long arg)
{
#ifdef EXT2FS_DEBUG
printk ("ext2_ioctl: cmd = %d, arg = %d\n", cmd, arg);
#endif
return -EINVAL;
}
fs/ext2/namei.c
View file @ 3579bc6f
This diff is collapsed.
fs/ext2/symlink.c
View file @ 3579bc6f
......@@ -72,7 +72,7 @@ static int ext2_follow_link(struct inode * dir, struct inode * inode,
return -ELOOP;
}
if (inode->i_blocks) {
if (!(bh = ext2_bread (inode, 0, 0))) {
if (!(bh = ext2_bread (inode, 0, 0, &error))) {
iput (dir);
iput (inode);
return -EIO;
......@@ -93,7 +93,7 @@ static int ext2_readlink (struct inode * inode, char * buffer, int buflen)
{
struct buffer_head * bh = NULL;
char * link;
int i;
int i, err;
char c;
if (!S_ISLNK(inode->i_mode)) {
......@@ -103,7 +103,7 @@ static int ext2_readlink (struct inode * inode, char * buffer, int buflen)
if (buflen > inode->i_sb->s_blocksize - 1)
buflen = inode->i_sb->s_blocksize - 1;
if (inode->i_blocks) {
bh = ext2_bread (inode, 0, 0);
bh = ext2_bread (inode, 0, 0, &err);
if (!bh) {
iput (inode);
return 0;
......
fs/file_table.c
View file @ 3579bc6f
......@@ -9,6 +9,12 @@
struct file file_table[NR_FILE];
unsigned long file_table_init(unsigned long start, unsigned long end)
{
memset(file_table,0,sizeof(file_table));
return start;
}
struct file * get_empty_filp(void)
{
int i;
......
fs/isofs/util.c
View file @ 3579bc6f
......@@ -11,15 +11,13 @@
int
isonum_711 (p)
char *p;
isonum_711 (char * p)
{
return (*p & 0xff);
}
int
isonum_712 (p)
char *p;
isonum_712 (char * p)
{
int val;
......@@ -30,22 +28,19 @@ char *p;
}
int
isonum_721 (p)
char *p;
isonum_721 (char * p)
{
return ((p[0] & 0xff) | ((p[1] & 0xff) << 8));
}
int
isonum_722 (p)
char *p;
isonum_722 (char * p)
{
return (((p[0] & 0xff) << 8) | (p[1] & 0xff));
}
int
isonum_723 (p)
char *p;
isonum_723 (char * p)
{
#if 0
if (p[0] != p[3] || p[1] != p[2]) {
......@@ -57,8 +52,7 @@ char *p;
}
int
isonum_731 (p)
char *p;
isonum_731 (char * p)
{
return ((p[0] & 0xff)
| ((p[1] & 0xff) << 8)
......@@ -67,8 +61,7 @@ char *p;
}
int
isonum_732 (p)
char *p;
isonum_732 (char * p)
{
return (((p[0] & 0xff) << 24)
| ((p[1] & 0xff) << 16)
......@@ -77,8 +70,7 @@ char *p;
}
int
isonum_733 (p)
char *p;
isonum_733 (char * p)
{
#if 0
int i;
......@@ -93,9 +85,7 @@ char *p;
return (isonum_731 (p));
}
int iso_date(p, flag)
char * p;
int flag;
int iso_date(char * p, int flag)
{
int year, month, day, hour ,minute, second, tz;
int crtime, days, i;
......
fs/namei.c
View file @ 3579bc6f
......@@ -183,9 +183,7 @@ static int dir_namei(const char * pathname, int * namelen, const char ** name,
if (!c)
break;
base->i_count++;
((char *) thisname)[len] = '\0'; /* fake string.. */
error = lookup(base,thisname,len,&inode);
((char *) thisname)[len] = c;
if (error) {
iput(base);
return error;
......
fs/nfs/dir.c
View file @ 3579bc6f
......@@ -283,11 +283,12 @@ static void nfs_lookup_cache_refresh(struct inode *file,
}
}
static int nfs_lookup(struct inode *dir, const char *name, int len,
static int nfs_lookup(struct inode *dir, const char *__name, int len,
struct inode **result)
{
struct nfs_fh fhandle;
struct nfs_fattr fattr;
char name[len > NFS_MAXNAMLEN? 1 : len+1];
int error;
*result = NULL;
......@@ -300,6 +301,8 @@ static int nfs_lookup(struct inode *dir, const char *name, int len,
iput(dir);
return -ENAMETOOLONG;
}
memcpy(name,__name,len);
name[len] = '\0';
if (len == 1 && name[0] == '.') { /* cheat for "." */
*result = dir;
return 0;
......
fs/open.c
View file @ 3579bc6f
......@@ -167,11 +167,11 @@ int sys_access(const char * filename,int mode)
return res;
i_mode = inode->i_mode;
res = i_mode & 0777;
iput(inode);
if (current->uid == inode->i_uid)
res >>= 6;
else if (in_group_p(inode->i_gid))
res >>= 3;
iput(inode);
if ((res & mode) == mode)
return 0;
/*
......
fs/pipe.c
View file @ 3579bc6f
......@@ -108,7 +108,7 @@ static int bad_pipe_rw(struct inode * inode, struct file * filp, char * buf, int
}
static int pipe_ioctl(struct inode *pino, struct file * filp,
unsigned int cmd, unsigned int arg)
unsigned int cmd, unsigned long arg)
{
int error;
......
fs/select.c
View file @ 3579bc6f
......@@ -81,23 +81,30 @@ int do_select(int n, fd_set *in, fd_set *out, fd_set *ex,
int count;
select_table wait_table, *wait;
struct select_table_entry *entry;
int i;
int max;
max = -1;
for (i = 0 ; i < n ; i++) {
if (!FD_ISSET(i, in) &&
!FD_ISSET(i, out) &&
!FD_ISSET(i, ex))
continue;
if (!current->filp[i])
return -EBADF;
if (!current->filp[i]->f_inode)
return -EBADF;
max = i;
unsigned long set;
int i,j;
int max = -1;
for (j = 0 ; j < __FDSET_LONGS ; j++) {
i = j << 5;
if (i >= n)
break;
set = in->fds_bits[j] | out->fds_bits[j] | ex->fds_bits[j];
for ( ; set ; i++,set >>= 1) {
if (i >= n)
goto end_check;
if (!(set & 1))
continue;
if (!current->filp[i])
return -EBADF;
if (!current->filp[i]->f_inode)
return -EBADF;
max = i;
}
}
end_check:
n = max + 1;
entry = (struct select_table_entry *) get_free_page(GFP_KERNEL);
entry = (struct select_table_entry *) __get_free_page(GFP_KERNEL);
if (!entry)
return -ENOMEM;
FD_ZERO(res_in);
......@@ -182,6 +189,9 @@ __set_fd_set(nr, (unsigned long *) (fsp), (unsigned long *) (fdp))
* We can actually return ERESTARTSYS insetad of EINTR, but I'd
* like to be certain this leads to no problems. So I return
* EINTR just for safety.
*
* Update: ERESTARTSYS breaks at least the xview clock binary, so
* I'm trying ERESTARTNOHAND which restart only when you want to.
*/
int sys_select( unsigned long *buffer )
{
......@@ -236,7 +246,7 @@ int sys_select( unsigned long *buffer )
if (i < 0)
return i;
if (!i && (current->signal & ~current->blocked))
return -EINTR;
return -ERESTARTNOHAND;
set_fd_set(n, inp, &res_in);
set_fd_set(n, outp, &res_out);
set_fd_set(n, exp, &res_ex);
......
fs/super.c
View file @ 3579bc6f
......@@ -379,9 +379,12 @@ int sys_mount(char * dev_name, char * dir_name, char * type,
return do_remount(dir_name,new_flags & ~MS_MGC_MSK & ~MS_REMOUNT);
}
if (type) {
for (i = 0 ; i < 100 ; i++)
for (i = 0 ; i < 100 ; i++) {
if (TASK_SIZE <= (unsigned long) type)
return -EFAULT;
if (!(tmp[i] = get_fs_byte(type++)))
break;
}
t = tmp;
} else
t = NULL;
......@@ -446,7 +449,6 @@ void mount_root(void)
struct super_block * sb;
struct inode * inode;
memset(file_table, 0, sizeof(file_table));
memset(super_block, 0, sizeof(super_block));
fcntl_init_locks();
if (MAJOR(ROOT_DEV) == 2) {
......
include/asm/bitops.h
View file @ 3579bc6f
......@@ -20,7 +20,7 @@ struct __dummy { unsigned long a[100]; };
extern inline int set_bit(int nr, void * addr)
{
char ok;
unsigned char ok;
__asm__ __volatile__("btsl %2,%1\n\tsetb %0"
:"=q" (ok),"=m" (ADDR)
......@@ -30,7 +30,7 @@ extern inline int set_bit(int nr, void * addr)
extern inline int clear_bit(int nr, void * addr)
{
char ok;
unsigned char ok;
__asm__ __volatile__("btrl %2,%1\n\tsetnb %0"
:"=q" (ok),"=m" (ADDR)
......@@ -44,7 +44,7 @@ extern inline int clear_bit(int nr, void * addr)
*/
extern inline int test_bit(int nr, void * addr)
{
char ok;
unsigned char ok;
__asm__ __volatile__("btl %2,%1\n\tsetb %0"
:"=q" (ok)
......
include/asm/dma.h
View file @ 3579bc6f
......@@ -247,9 +247,11 @@ static __inline__ int get_dma_residue(unsigned int dmanr)
: ((dmanr&3)<<2) + 2 + IO_DMA2_BASE;
/* using short to get 16-bit wrap around */
short count = 1 + inb(io_port) +
( inb(io_port) << 8 );
unsigned short count;
count = 1 + inb(io_port);
count += inb(io_port) << 8;
return (dmanr<=3)? count : (count<<1);
}
......
include/asm/segment.h
View file @ 3579bc6f
extern inline unsigned char get_fs_byte(const char * addr)
static inline unsigned char get_fs_byte(const char * addr)
{
register unsigned char _v;
......@@ -6,7 +6,7 @@ extern inline unsigned char get_fs_byte(const char * addr)
return _v;
}
extern inline unsigned short get_fs_word(const unsigned short *addr)
static inline unsigned short get_fs_word(const unsigned short *addr)
{
unsigned short _v;
......@@ -14,7 +14,7 @@ extern inline unsigned short get_fs_word(const unsigned short *addr)
return _v;
}
extern inline unsigned long get_fs_long(const unsigned long *addr)
static inline unsigned long get_fs_long(const unsigned long *addr)
{
unsigned long _v;
......@@ -22,22 +22,22 @@ extern inline unsigned long get_fs_long(const unsigned long *addr)
return _v;
}
extern inline void put_fs_byte(char val,char *addr)
static inline void put_fs_byte(char val,char *addr)
{
__asm__ ("movb %0,%%fs:%1"::"q" (val),"m" (*addr));
}
extern inline void put_fs_word(short val,short * addr)
static inline void put_fs_word(short val,short * addr)
{
__asm__ ("movw %0,%%fs:%1"::"r" (val),"m" (*addr));
}
extern inline void put_fs_long(unsigned long val,unsigned long * addr)
static inline void put_fs_long(unsigned long val,unsigned long * addr)
{
__asm__ ("movl %0,%%fs:%1"::"r" (val),"m" (*addr));
}
extern inline void memcpy_tofs(void * to, const void * from, unsigned long n)
static inline void memcpy_tofs(void * to, const void * from, unsigned long n)
{
__asm__("cld\n\t"
"push %%es\n\t"
......@@ -56,7 +56,7 @@ __asm__("cld\n\t"
:"cx","di","si");
}
extern inline void memcpy_fromfs(void * to, const void * from, unsigned long n)
static inline void memcpy_fromfs(void * to, const void * from, unsigned long n)
{
__asm__("cld\n\t"
"testb $1,%%cl\n\t"
......@@ -78,21 +78,21 @@ __asm__("cld\n\t"
* [ nothing wrong here, Linus: I just changed the ax to be any reg ]
*/
extern inline unsigned long get_fs(void)
static inline unsigned long get_fs(void)
{
unsigned short _v;
__asm__("mov %%fs,%0":"=r" (_v):);
return _v;
}
extern inline unsigned long get_ds(void)
static inline unsigned long get_ds(void)
{
unsigned short _v;
__asm__("mov %%ds,%0":"=r" (_v):);
return _v;
}
extern inline void set_fs(unsigned long val)
static inline void set_fs(unsigned long val)
{
__asm__ __volatile__("mov %0,%%fs"::"r" ((unsigned short) val));
}
......
include/linux/ext2_fs.h
View file @ 3579bc6f
......@@ -10,6 +10,11 @@
*/
#undef EXT2FS_DEBUG
/*
* Define EXT2FS_PRE_02B_COMPAT to convert ext 2 fs prior to 0.2b
*/
#undef EXT2FS_PRE_02B_COMPAT
/*
* Define DONT_USE_DCACHE to inhibit the directory cache
*/
......@@ -23,7 +28,7 @@
/*
* The second extended file system version
*/
#define EXT2FS_VERSION "0.2d, 93/03/30"
#define EXT2FS_VERSION "0.3, 93/04/22"
/*
* Special inodes numbers
......@@ -39,6 +44,11 @@
#define EXT2_OLD_SUPER_MAGIC 0xEF51
#define EXT2_SUPER_MAGIC 0xEF53
/*
* Maximal count of links to a file
*/
#define EXT2_LINK_MAX 32000
/*
* Macro-instructions used to manage several block sizes
*/
......@@ -50,6 +60,7 @@
#else
# define EXT2_BLOCK_SIZE(s) (EXT2_MIN_BLOCK_SIZE << (s)->s_log_block_size)
#endif
#define EXT2_ACLE_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (struct ext2_acl_entry))
#define EXT2_ADDR_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / sizeof (unsigned long))
#ifdef KERNEL
# define EXT2_BLOCK_SIZE_BITS(s) ((s)->u.ext2_sb.s_log_block_size + 10)
......@@ -72,6 +83,29 @@
# define EXT2_FRAGS_PER_BLOCK(s) (EXT2_BLOCK_SIZE(s) / EXT2_FRAG_SIZE(s))
#endif
/*
* ACL structures
*/
struct ext2_acl_header /* Header of Access Control Lists */
{
unsigned long aclh_file_count;
unsigned long aclh_acle_count;
unsigned long aclh_first_acle;
unsigned long aclh_reserved;
};
struct ext2_acl_entry /* Access Control List Entry */
{
unsigned short acle_perms; /* Access permissions */
unsigned short acle_type; /* Type of entry */
unsigned short acle_tag; /* User or group identity */
unsigned short acle_pad1;
unsigned long acle_reserved;
unsigned long acle_next; /* Pointer on next entry for the */
/* same inode or on next free entry */
};
/*
* Structure of a blocks group descriptor
*/
......@@ -196,6 +230,9 @@ struct ext2_dir_entry {
* Function prototypes
*/
/* acl.c */
extern int ext2_permission (struct inode *, int);
/* balloc.c */
extern int ext2_new_block (struct super_block *, unsigned long);
extern void ext2_free_block (struct super_block *, unsigned long);
......@@ -230,10 +267,9 @@ extern unsigned long ext2_count_free_inodes (struct super_block *);
/* inode.c */
extern int ext2_bmap (struct inode *, int);
extern struct buffer_head * ext2_getblk (struct inode *, int, int);
extern struct buffer_head * ext2_bread (struct inode *, int, int);
extern struct buffer_head * ext2_getblk (struct inode *, int, int, int *);
extern struct buffer_head * ext2_bread (struct inode *, int, int, int *);
extern void ext2_truncate (struct inode *);
extern void ext2_put_super (struct super_block *);
extern void ext2_write_super (struct super_block *);
extern struct super_block * ext2_read_super (struct super_block *,void *,int);
......@@ -242,6 +278,10 @@ extern void ext2_write_inode (struct inode *);
extern void ext2_put_inode (struct inode *);
extern void ext2_statfs (struct super_block *, struct statfs *);
/* ioctl.c */
extern int ext2_ioctl (struct inode *, struct file *, unsigned int,
unsigned long);
/* namei.c */
extern int ext2_open (struct inode *, struct file *);
extern void ext2_release (struct inode *, struct file *);
......@@ -257,6 +297,9 @@ extern int ext2_mknod (struct inode *, const char *, int, int, int);
extern int ext2_rename (struct inode *, const char *, int,
struct inode *, const char *, int);
/* truncate.c */
extern void ext2_truncate (struct inode *);
/*
* Inodes and files operations
*/
......
include/linux/ext2_fs_i.h
View file @ 3579bc6f
......@@ -5,6 +5,7 @@
* second extended file system inode data in memory
*/
struct ext2_inode_info {
unsigned long i_data[15];
unsigned long i_flags;
unsigned long i_faddr;
unsigned char i_frag;
......@@ -17,7 +18,6 @@ struct ext2_inode_info {
unsigned long i_block_group;
unsigned long i_next_alloc_block;
unsigned long i_next_alloc_goal;
unsigned long i_data[15];
};
#endif
include/linux/fs.h
View file @ 3579bc6f
......@@ -21,10 +21,10 @@
* recompiled to take full advantage of the new limits..
*/
#undef NR_OPEN
#define NR_OPEN 256
#define NR_OPEN 256 /* don't change - fd_set etc depend on this */
#define NR_INODE 256
#define NR_FILE 128
#define NR_INODE 256 /* this should be bigger than NR_FILE */
#define NR_FILE 128 /* this can well be larger on a larger system */
#define NR_SUPER 16
#define NR_HASH 997
#define NR_FILE_LOCKS 32
......@@ -67,6 +67,7 @@
extern void buffer_init(void);
extern unsigned long inode_init(unsigned long start, unsigned long end);
extern unsigned long file_table_init(unsigned long start, unsigned long end);
#define MAJOR(a) (((unsigned)(a))>>8)
#define MINOR(a) ((a)&0xff)
......@@ -264,7 +265,7 @@ struct file_operations {
int (*write) (struct inode *, struct file *, char *, int);
int (*readdir) (struct inode *, struct file *, struct dirent *, int);
int (*select) (struct inode *, struct file *, int, select_table *);
int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned int);
int (*ioctl) (struct inode *, struct file *, unsigned int, unsigned long);
int (*mmap) (struct inode *, struct file *, unsigned long, size_t, int, unsigned long);
int (*open) (struct inode *, struct file *);
void (*release) (struct inode *, struct file *);
......
include/linux/keyboard.h
View file @ 3579bc6f
......@@ -65,6 +65,7 @@ extern struct kbd_struct kbd_table[];
#define VC_RAW 7 /* raw (scancode) mode */
#define VC_CRLF 8 /* 0 - enter sends CR, 1 - enter sends CRLF */
#define VC_META 9 /* 0 - meta, 1 - meta=prefix with ESC */
#define VC_PAUSE 10 /* pause key pressed */
#define LED_MASK 7
......
include/linux/mm.h
View file @ 3579bc6f
......@@ -92,6 +92,7 @@ extern unsigned long put_dirty_page(struct task_struct * tsk,unsigned long page,
extern void free_page_tables(struct task_struct * tsk);
extern void clear_page_tables(struct task_struct * tsk);
extern int copy_page_tables(struct task_struct * new);
extern int clone_page_tables(struct task_struct * new);
extern int unmap_page_range(unsigned long from, unsigned long size);
extern int remap_page_range(unsigned long from, unsigned long to, unsigned long size, int mask);
extern int zeromap_page_range(unsigned long from, unsigned long size, int mask);
......
include/linux/sched.h
View file @ 3579bc6f
......@@ -149,6 +149,7 @@ struct task_struct {
unsigned long signal;
unsigned long blocked; /* bitmap of masked signals */
unsigned long flags; /* per process flags, defined below */
int errno;
/* various fields */
struct sigaction sigaction[32];
unsigned long saved_kernel_stack;
......@@ -220,7 +221,7 @@ struct task_struct {
* your own risk!. Base=0, limit=0x1fffff (=2MB)
*/
#define INIT_TASK \
/* state etc */ { 0,15,15,0,0,0, \
/* state etc */ { 0,15,15,0,0,0,0, \
/* signals */ {{ 0, },}, \
/* stack */ 0,0, \
/* ec,brk... */ 0,0,0,0,0,0,0,0, \
......
include/linux/sys.h
View file @ 3579bc6f
......@@ -2,6 +2,8 @@
* Why isn't this a .c file? Enquiring minds....
*/
#define sys_clone sys_fork
extern int sys_setup();
extern int sys_exit();
extern int sys_fork();
......@@ -144,7 +146,8 @@ sys_ftruncate, sys_fchmod, sys_fchown, sys_getpriority, sys_setpriority,
sys_profil, sys_statfs, sys_fstatfs, sys_ioperm, sys_socketcall,
sys_syslog, sys_setitimer, sys_getitimer, sys_newstat, sys_newlstat,
sys_newfstat, sys_newuname, sys_iopl, sys_vhangup, sys_idle, sys_vm86,
sys_wait4, sys_swapoff, sys_sysinfo, sys_ipc, sys_fsync, sys_sigreturn };
sys_wait4, sys_swapoff, sys_sysinfo, sys_ipc, sys_fsync, sys_sigreturn,
sys_clone };
/* So we don't have to do any more manual updating.... */
int NR_syscalls = sizeof(sys_call_table)/sizeof(fn_ptr);
include/linux/tty.h
View file @ 3579bc6f
......@@ -138,6 +138,7 @@ extern int get_tty_queue(struct tty_queue * queue);
#define QUIT_CHAR(tty) ((tty)->termios->c_cc[VQUIT])
#define ERASE_CHAR(tty) ((tty)->termios->c_cc[VERASE])
#define KILL_CHAR(tty) ((tty)->termios->c_cc[VKILL])
#define WERASE_CHAR(tty) ((tty)->termios->c_cc[VWERASE])
#define EOF_CHAR(tty) ((tty)->termios->c_cc[VEOF])
#define START_CHAR(tty) ((tty)->termios->c_cc[VSTART])
#define STOP_CHAR(tty) ((tty)->termios->c_cc[VSTOP])
......@@ -213,7 +214,7 @@ struct tty_struct {
void (*close)(struct tty_struct * tty, struct file * filp);
void (*write)(struct tty_struct * tty);
int (*ioctl)(struct tty_struct *tty, struct file * file,
unsigned int cmd, unsigned int arg);
unsigned int cmd, unsigned long arg);
void (*throttle)(struct tty_struct * tty, int status);
void (*set_termios)(struct tty_struct *tty, struct termios * old);
struct tty_struct *link;
......@@ -239,7 +240,7 @@ struct tty_ldisc {
int (*write)(struct tty_struct * tty, struct file * file,
char * buf, int nr);
int (*ioctl)(struct tty_struct * tty, struct file * file,
unsigned int cmd, unsigned int arg);
unsigned int cmd, unsigned long arg);
/*
* The following routines are called from below.
*/
......@@ -340,7 +341,7 @@ extern void wait_until_sent(struct tty_struct * tty);
extern void copy_to_cooked(struct tty_struct * tty);
extern int tty_register_ldisc(int disc, struct tty_ldisc *new);
extern int tty_ioctl(struct inode *, struct file *, unsigned int, unsigned int);
extern int tty_ioctl(struct inode *, struct file *, unsigned int, unsigned long);
extern int is_orphaned_pgrp(int pgrp);
extern int is_ignored(int sig);
extern int tty_signal(int sig, struct tty_struct *tty);
......@@ -375,6 +376,6 @@ extern void unblank_screen(void);
/* vt.c */
extern int vt_ioctl(struct tty_struct *tty, struct file * file,
unsigned int cmd, unsigned int arg);
unsigned int cmd, unsigned long arg);
#endif
include/linux/unistd.h
View file @ 3579bc6f
......@@ -126,6 +126,7 @@
#define __NR_ipc 117 /* not implemented yet */
#define __NR_fsync 118 /* not implemented yet */
#define __NR_sigreturn 119
#define __NR_clone 120
extern int errno;
......
include/linux/xd.h
View file @ 3579bc6f
......@@ -114,7 +114,7 @@ static void xd_geninit (void);
static int xd_open (struct inode *inode,struct file *file);
static void do_xd_request (void);
static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned int arg);
static int xd_ioctl (struct inode *inode,struct file *file,unsigned int cmd,unsigned long arg);
static void xd_release (struct inode *inode,struct file *file);
static int xd_reread_partitions (int dev);
static int xd_readwrite (u_char operation,u_char drive,u_char *buffer,u_int block,u_int count);
......
init/main.c
View file @ 3579bc6f
......@@ -198,7 +198,15 @@ static void parse_options(char *line)
if (!strcmp(line,"rw")) {
root_mountflags &= ~MS_RDONLY;
continue;
}
}
if (!strcmp(line,"no387")) {
hard_math = 0;
__asm__("movl %%cr0,%%eax\n\t"
"andl $0xFFFFFFF9,%%eax\n\t"
"orl $0x4,%%eax\n\t"
"movl %%eax,%%cr0\n\t" ::: "ax");
continue;
}
/*
* Then check if it's an environment variable or
* an option.
......@@ -275,6 +283,7 @@ void start_kernel(void)
memory_start = scsi_dev_init(memory_start,memory_end);
#endif
memory_start = inode_init(memory_start,memory_end);
memory_start = file_table_init(memory_start,memory_end);
mem_init(low_memory_start,memory_start,memory_end);
buffer_init();
time_init();
......
kernel/FPU-emu/Makefile
View file @ 3579bc6f
......@@ -19,15 +19,15 @@ OBJS = fpu_entry.o
ifdef CONFIG_MATH_EMULATION
OBJS := $(OBJS) div_small.o errors.o\
fpu_arith.o fpu_aux.o fpu_etc.o fpu_trig.o\
load_store.o get_address.o\
poly_atan.o poly_l2.o poly_2xm1.o poly_sin.o poly_tan.o\
poly_div.o poly_mul64.o polynomial.o\
precision.o\
reg_add_sub.o reg_compare.o reg_constant.o reg_ld_str.o\
OBJS := $(OBJS) div_small.o errors.o \
fpu_arith.o fpu_aux.o fpu_etc.o fpu_trig.o \
load_store.o get_address.o \
poly_atan.o poly_l2.o poly_2xm1.o poly_sin.o poly_tan.o \
poly_div.o poly_mul64.o polynomial.o \
reg_add_sub.o reg_compare.o reg_constant.o reg_ld_str.o \
reg_div.o reg_mul.o reg_norm.o \
reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o\
reg_u_add.o reg_u_div.o reg_u_mul.o reg_u_sub.o \
reg_round.o \
wm_shrx.o wm_sqrt.o
endif
......
kernel/FPU-emu/README
View file @ 3579bc6f
......@@ -83,7 +83,7 @@ is confined to five files:
----------------------- Limitations of wm-FPU-emu -----------------------
There are a number of differences between the current wm-FPU-emu
(version beta 1.2) and the 80486 FPU (apart from bugs). Some of the
(version beta 1.3) and the 80486 FPU (apart from bugs). Some of the
more important differences are listed below:
Internal computations do not use de-normal numbers (but External
......@@ -91,12 +91,11 @@ de-normals ARE recognised and generated). The design of wm-FPU-emu
allows a larger exponent range than the 80486 FPU for internal
computations.
All computations are performed at full 64 bit precision with `round to
nearest or even' performed for the basic functions. The results of the
basic arithmetic functions and sqrt are then rounded to lower
precision if required by the PC bits of the FPU control word. Under
the crt0 version for Linux current at March 1993, the FPU PC bits
specify 53 bits precision.
All internal computations are performed at 64 bit or higher precision.
The results of the basic arithmetic functions and sqrt are then
rounded to the precision required by the PC bits of the FPU control
word. Under the crt0 version for Linux current at March 1993, the FPU
PC bits specify 53 bits precision.
The precision flag (PE of the FPU status word) is not implemented.
Does anyone write code which uses this feature?
......@@ -193,3 +192,12 @@ tan(x) 1e-10 .. pi/2-(1e-10) 62.4 (x <= pi/4) 62.1
exp(x) 0 .. 1 63.1 62.9
log(x) 1+1e-6 .. 2 62.4 62.1
As of version 1.3 of the emulator, the accuracy of the basic
arithmetic has been improved (by a small fraction of a bit). Care has
been taken to ensure full accuracy of the rounding of the basic
arithmetic functions (+,-,*,/,and fsqrt), and they all now produce
results which are exact to the 64th bit (unless there are any bugs
left). To ensure this, it was necessary to effectively get information
of up to about 128 bits precision. The emulator now passes the
"paranoia" tests.
kernel/FPU-emu/control_w.h
View file @ 3579bc6f
......@@ -33,20 +33,9 @@
/* p 15-5: Precision control bits affect only the following:
ADD, SUB(R), MUL, DIV(R), and SQRT */
#define PRECISION_ADJUST_CONTROL (control_word & 0x300)
#define PR_24_BITS 0x000
#define PR_53_BITS 0x200
/* By doing this as a macro, we allow easy modification */
#define PRECISION_ADJUST(x) \
switch (PRECISION_ADJUST_CONTROL) \
{ \
case PR_24_BITS: \
round_to_24_bits(x); \
break; \
case PR_53_BITS: \
round_to_53_bits(x); \
break; \
}
#define FULL_PRECISION (CW_PC | RC_RND)
#define PR_24_BITS _Const_(0x000)
#define PR_53_BITS _Const_(0x200)
#define PR_64_BITS _Const_(0x300)
#endif _CONTROLW_H_
kernel/FPU-emu/fpu_arith.c
View file @ 3579bc6f
......@@ -18,16 +18,14 @@
void fadd__()
{
/* fadd st,st(i) */
reg_add(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_add(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr, control_word);
}
void fmul__()
{
/* fmul st,st(i) */
reg_mul(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_mul(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr, control_word);
}
......@@ -35,32 +33,28 @@ void fmul__()
void fsub__()
{
/* fsub st,st(i) */
reg_sub(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_sub(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr, control_word);
}
void fsubr_()
{
/* fsubr st,st(i) */
reg_sub(&st(FPU_rm), FPU_st0_ptr, FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_sub(&st(FPU_rm), FPU_st0_ptr, FPU_st0_ptr, control_word);
}
void fdiv__()
{
/* fdiv st,st(i) */
reg_div(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_div(FPU_st0_ptr, &st(FPU_rm), FPU_st0_ptr, control_word);
}
void fdivr_()
{
/* fdivr st,st(i) */
reg_div(&st(FPU_rm), FPU_st0_ptr, FPU_st0_ptr);
PRECISION_ADJUST(FPU_st0_ptr);
reg_div(&st(FPU_rm), FPU_st0_ptr, FPU_st0_ptr, control_word);
}
......@@ -68,16 +62,14 @@ void fdivr_()
void fadd_i()
{
/* fadd st(i),st */
reg_add(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_add(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
}
void fmul_i()
{
/* fmul st(i),st */
reg_mul(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_mul(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
}
......@@ -85,9 +77,8 @@ void fsubri()
{
/* fsubr st(i),st */
/* This is the sense of the 80486 manual
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm)); */
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word); */
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
}
......@@ -95,25 +86,22 @@ void fsub_i()
{
/* fsub st(i),st */
/* This is the sense of the 80486 manual
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm)); */
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word); */
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
}
void fdivri()
{
/* fdivr st(i),st */
reg_div(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_div(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
}
void fdiv_i()
{
/* fdiv st(i),st */
reg_div(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_div(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
}
......@@ -121,8 +109,7 @@ void fdiv_i()
void faddp_()
{
/* faddp st(i),st */
reg_add(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_add(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
pop();
}
......@@ -130,8 +117,7 @@ void faddp_()
void fmulp_()
{
/* fmulp st(i),st */
reg_mul(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_mul(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
pop();
}
......@@ -141,9 +127,8 @@ void fsubrp()
{
/* fsubrp st(i),st */
/* This is the sense of the 80486 manual
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm)); */
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word); */
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
pop();
}
......@@ -152,9 +137,8 @@ void fsubp_()
{
/* fsubp st(i),st */
/* This is the sense of the 80486 manual
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm)); */
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_sub(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word); */
reg_sub(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
pop();
}
......@@ -162,8 +146,7 @@ void fsubp_()
void fdivrp()
{
/* fdivrp st(i),st */
reg_div(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_div(FPU_st0_ptr, &st(FPU_rm), &st(FPU_rm), control_word);
pop();
}
......@@ -171,8 +154,7 @@ void fdivrp()
void fdivp_()
{
/* fdivp st(i),st */
reg_div(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm));
PRECISION_ADJUST(&st(FPU_rm));
reg_div(&st(FPU_rm), FPU_st0_ptr, &st(FPU_rm), control_word);
pop();
}
kernel/FPU-emu/fpu_emu.h
View file @ 3579bc6f
......@@ -92,12 +92,17 @@ extern void poly_div16(long long *x);
extern void polynomial(unsigned accum[], unsigned x[],
unsigned short terms[][4], int n);
extern void normalize(FPU_REG *x);
extern void reg_div(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ);
extern void reg_u_sub(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ);
extern void reg_u_mul(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ);
extern void reg_u_div(long long *arg1, long long *arg2, FPU_REG *answ);
extern void reg_u_add(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ);
extern void wm_sqrt(FPU_REG *n);
extern void reg_div(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ,
unsigned int control_w);
extern void reg_u_sub(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ,
unsigned int control_w);
extern void reg_u_mul(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ,
unsigned int control_w);
extern void reg_u_div(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ,
unsigned int control_w);
extern void reg_u_add(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ,
unsigned int control_w);
extern void wm_sqrt(FPU_REG *n, unsigned int control_w);
extern unsigned shrx(void *l, unsigned x);
extern unsigned shrxs(void *v, unsigned x);
extern unsigned long div_small(unsigned long long *x, unsigned long y);
......
kernel/FPU-emu/fpu_entry.c
View file @ 3579bc6f
......@@ -225,36 +225,37 @@ void math_emulate(long arg)
switch ( (FPU_modrm >> 3) & 7 )
{
case 0: /* fadd */
reg_add(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr);
reg_add(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr,
control_word);
break;
case 1: /* fmul */
reg_mul(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr);
reg_mul(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr,
control_word);
break;
case 2: /* fcom */
compare_st_data();
goto no_precision_adjust;
break;
case 3: /* fcomp */
compare_st_data();
pop();
goto no_precision_adjust;
break;
case 4: /* fsub */
reg_sub(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr);
reg_sub(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr,
control_word);
break;
case 5: /* fsubr */
reg_sub(&FPU_loaded_data, FPU_st0_ptr, FPU_st0_ptr);
reg_sub(&FPU_loaded_data, FPU_st0_ptr, FPU_st0_ptr,
control_word);
break;
case 6: /* fdiv */
reg_div(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr);
reg_div(FPU_st0_ptr, &FPU_loaded_data, FPU_st0_ptr,
control_word);
break;
case 7: /* fdivr */
reg_div(&FPU_loaded_data, FPU_st0_ptr, FPU_st0_ptr);
reg_div(&FPU_loaded_data, FPU_st0_ptr, FPU_st0_ptr,
control_word);
break;
}
PRECISION_ADJUST(FPU_st0_ptr);
no_precision_adjust:
;
}
else
stack_underflow();
......@@ -338,7 +339,6 @@ void math_emulate(long arg)
void __math_abort(struct info * info, unsigned int signal)
{
RE_ENTRANT_CHECK_OFF
FPU_EIP = FPU_ORIG_EIP;
send_sig(signal,current,1);
RE_ENTRANT_CHECK_OFF
......
kernel/FPU-emu/fpu_proto.h
View file @ 3579bc6f
......@@ -68,8 +68,8 @@ extern void poly_tan(FPU_REG *arg, FPU_REG *y_reg);
extern int round_to_53_bits(FPU_REG *reg);
extern int round_to_24_bits(FPU_REG *reg);
/* reg_add_sub.c */
extern void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest);
extern void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest);
extern void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest, int control_w);
extern void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest, int control_w);
/* reg_compare.c */
extern int compare(FPU_REG *b);
extern void compare_st_data(void);
......@@ -102,4 +102,4 @@ extern void frstor(void);
extern char *fstenv(void);
extern void fsave(void);
/* reg_mul.c */
extern void reg_mul(FPU_REG *a, FPU_REG *b, FPU_REG *dest);
extern void reg_mul(FPU_REG *a, FPU_REG *b, FPU_REG *dest, unsigned int control_w);
kernel/FPU-emu/fpu_trig.c
View file @ 3579bc6f
......@@ -30,7 +30,7 @@ static int trig_arg(FPU_REG *X)
control_word |= RC_CHOP;
reg_move(X, &quot);
reg_div(&quot, &CONST_PI2, &quot);
reg_div(&quot, &CONST_PI2, &quot, FULL_PRECISION);
reg_move(&quot, &tmp);
round_to_int(&tmp);
......@@ -40,7 +40,7 @@ static int trig_arg(FPU_REG *X)
q = *(long long *)&(tmp.sigl);
normalize(&tmp);
reg_sub(&quot, &tmp, X);
reg_sub(&quot, &tmp, X, FULL_PRECISION);
rv = q & 7;
control_word = old_cw;
......@@ -107,17 +107,17 @@ static void f2xm1(void)
/* poly_2xm1(x) requires 0 < x < 1. */
if ( poly_2xm1(FPU_st0_ptr, &rv) )
return; /* error */
reg_mul(&rv, FPU_st0_ptr, FPU_st0_ptr);
reg_mul(&rv, FPU_st0_ptr, FPU_st0_ptr, FULL_PRECISION);
}
else
{
/* **** Should change poly_2xm1() to at least handle numbers near 0 */
/* poly_2xm1(x) doesn't handle negative numbers. */
/* So we compute (poly_2xm1(x+1)-1)/2, for -1 < x < 0 */
reg_add(FPU_st0_ptr, &CONST_1, &tmp);
reg_add(FPU_st0_ptr, &CONST_1, &tmp, FULL_PRECISION);
poly_2xm1(&tmp, &rv);
reg_mul(&rv, &tmp, &tmp);
reg_sub(&tmp, &CONST_1, FPU_st0_ptr);
reg_mul(&rv, &tmp, &tmp, FULL_PRECISION);
reg_sub(&tmp, &CONST_1, FPU_st0_ptr, FULL_PRECISION);
FPU_st0_ptr->exp--;
if ( FPU_st0_ptr->exp <= EXP_UNDER )
arith_underflow(FPU_st0_ptr);
......@@ -155,7 +155,7 @@ static void fptan(void)
if ( (q = trig_arg(FPU_st0_ptr)) != -1 )
{
if (q & 1)
reg_sub(&CONST_1, FPU_st0_ptr, FPU_st0_ptr);
reg_sub(&CONST_1, FPU_st0_ptr, FPU_st0_ptr, FULL_PRECISION);
poly_tan(FPU_st0_ptr, FPU_st0_ptr);
......@@ -286,10 +286,9 @@ static void fsqrt_(void)
expon = FPU_st0_ptr->exp - EXP_BIAS;
FPU_st0_ptr->exp = EXP_BIAS + (expon & 1); /* make st(0) in [1.0 .. 4.0) */
wm_sqrt(FPU_st0_ptr); /* Do the computation */
wm_sqrt(FPU_st0_ptr, control_word); /* Do the computation */
FPU_st0_ptr->exp += expon >> 1;
FPU_st0_ptr->tag = TW_Valid;
FPU_st0_ptr->sign = SIGN_POS;
}
else if ( FPU_st0_tag == TW_Zero )
......@@ -303,7 +302,6 @@ static void fsqrt_(void)
else
{ single_arg_error(); return; }
PRECISION_ADJUST(FPU_st0_ptr);
}
......@@ -338,7 +336,7 @@ static void fsin(void)
FPU_REG rv;
if (q & 1)
reg_sub(&CONST_1, FPU_st0_ptr, FPU_st0_ptr);
reg_sub(&CONST_1, FPU_st0_ptr, FPU_st0_ptr, FULL_PRECISION);
poly_sine(FPU_st0_ptr, &rv);
......@@ -390,7 +388,7 @@ static int f_cos(FPU_REG *arg)
FPU_REG rv;
if ( !(q & 1) )
reg_sub(&CONST_1, arg, arg);
reg_sub(&CONST_1, arg, arg, FULL_PRECISION);
poly_sine(arg, &rv);
......@@ -479,15 +477,15 @@ static void fprem_kernel(int round)
/* This should be the most common case */
long long q;
int c = 0;
reg_div(FPU_st0_ptr, st1_ptr, &tmp);
reg_div(FPU_st0_ptr, st1_ptr, &tmp, FULL_PRECISION);
round_to_int(&tmp); /* Fortunately, this can't overflow to 2^64 */
tmp.exp = EXP_BIAS + 63;
q = *(long long *)&(tmp.sigl);
normalize(&tmp);
reg_mul(st1_ptr, &tmp, &tmp);
reg_sub(FPU_st0_ptr, &tmp, FPU_st0_ptr);
reg_mul(st1_ptr, &tmp, &tmp, FULL_PRECISION);
reg_sub(FPU_st0_ptr, &tmp, FPU_st0_ptr, FULL_PRECISION);
if (q&4) c |= SW_C3;
if (q&2) c |= SW_C1;
......@@ -500,7 +498,7 @@ static void fprem_kernel(int round)
/* There is a large exponent difference ( >= 64 ) */
int N_exp;
reg_div(FPU_st0_ptr, st1_ptr, &tmp);
reg_div(FPU_st0_ptr, st1_ptr, &tmp, FULL_PRECISION);
/* N is 'a number between 32 and 63' (p26-113) */
N_exp = (tmp.exp & 31) + 32;
tmp.exp = EXP_BIAS + N_exp;
......@@ -511,8 +509,8 @@ static void fprem_kernel(int round)
tmp.exp = EXP_BIAS + expdif - N_exp;
reg_mul(st1_ptr, &tmp, &tmp);
reg_sub(FPU_st0_ptr, &tmp, FPU_st0_ptr);
reg_mul(st1_ptr, &tmp, &tmp, FULL_PRECISION);
reg_sub(FPU_st0_ptr, &tmp, FPU_st0_ptr, FULL_PRECISION);
setcc(SW_C2);
}
......@@ -556,7 +554,7 @@ static void fyl2x(void)
{
poly_l2(FPU_st0_ptr, FPU_st0_ptr);
reg_mul(FPU_st0_ptr, st1_ptr, st1_ptr);
reg_mul(FPU_st0_ptr, st1_ptr, st1_ptr, FULL_PRECISION);
pop(); FPU_st0_ptr = &st(0);
if ( FPU_st0_ptr->exp <= EXP_UNDER )
{ arith_underflow(FPU_st0_ptr); return; }
......@@ -667,20 +665,20 @@ static void fpatan(void)
if (compare(st1_ptr) == COMP_A_LT_B)
{
quadrant |= 4;
reg_div(FPU_st0_ptr, st1_ptr, &sum);
reg_div(FPU_st0_ptr, st1_ptr, &sum, FULL_PRECISION);
}
else
reg_div(st1_ptr, FPU_st0_ptr, &sum);
reg_div(st1_ptr, FPU_st0_ptr, &sum, FULL_PRECISION);
poly_atan(&sum);
if (quadrant & 4)
{
reg_sub(&CONST_PI2, &sum, &sum);
reg_sub(&CONST_PI2, &sum, &sum, FULL_PRECISION);
}
if (quadrant & 2)
{
reg_sub(&CONST_PI, &sum, &sum);
reg_sub(&CONST_PI, &sum, &sum, FULL_PRECISION);
}
if (quadrant & 1)
sum.sign ^= SIGN_POS^SIGN_NEG;
......@@ -708,7 +706,7 @@ static void fpatan(void)
if ( FPU_st0_ptr->sign == SIGN_POS )
{ reg_move(&CONST_PI4, st1_ptr); }
else
reg_add(&CONST_PI4, &CONST_PI2, st1_ptr);
reg_add(&CONST_PI4, &CONST_PI2, st1_ptr, FULL_PRECISION);
}
else
{
......@@ -775,7 +773,7 @@ static void fyl2xp1(void)
arith_invalid(st1_ptr); pop(); return;
}
reg_mul(FPU_st0_ptr, st1_ptr, st1_ptr);
reg_mul(FPU_st0_ptr, st1_ptr, st1_ptr, FULL_PRECISION);
pop();
}
else if ( (FPU_st0_tag == TW_Empty) | (st1_tag == TW_Empty) )
......
kernel/FPU-emu/poly_atan.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Compute the tan of a FPU_REG, using a polynomial approximation. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......@@ -12,6 +13,7 @@
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "control_w.h"
#define HIPOWERon 6 /* odd poly, negative terms */
......@@ -111,8 +113,7 @@ void poly_atan(FPU_REG *arg)
denom.sigh |= 0x80000000; /* 1 + arg */
arg->exp = numerator.exp;
reg_u_div((long long *)&(numerator.sigl),
(long long *)&(denom.sigl), arg);
reg_u_div(&numerator, &denom, arg, FULL_PRECISION);
exponent = arg->exp - EXP_BIAS;
}
......@@ -161,7 +162,8 @@ void poly_atan(FPU_REG *arg)
reg_move(&pos_poly, &odd_poly);
poly_add_1(&odd_poly);
reg_u_mul(&odd_poly, arg, &odd_poly); /* The complete odd polynomial */
/* The complete odd polynomial */
reg_u_mul(&odd_poly, arg, &odd_poly, FULL_PRECISION);
odd_poly.exp -= EXP_BIAS - 1;
/* will be a valid positive nr with expon = 0 */
......@@ -172,10 +174,10 @@ void poly_atan(FPU_REG *arg)
poly_add_1(&even_poly);
reg_div(&odd_poly, &even_poly, arg);
reg_div(&odd_poly, &even_poly, arg, FULL_PRECISION);
if ( recursions )
reg_sub(&CONST_PI4, arg, arg);
reg_sub(&CONST_PI4, arg, arg, FULL_PRECISION);
}
......
kernel/FPU-emu/poly_l2.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Compute the base 2 log of a FPU_REG, using a polynomial approximation. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......@@ -13,6 +14,7 @@
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "control_w.h"
......@@ -60,7 +62,7 @@ void poly_l2(FPU_REG *arg, FPU_REG *result)
exponent++;
accum.sign = 1; /* sign to negative */
num.exp = EXP_BIAS; /* needed to prevent errors in div routine */
reg_u_div((long long *)&(CONST_1.sigl), (long long *)&(arg->sigl), &num);
reg_u_div(&CONST_1, arg, &num, FULL_PRECISION);
}
else
{
......@@ -79,7 +81,7 @@ void poly_l2(FPU_REG *arg, FPU_REG *result)
poly_div4((long long *)&(denom.sigl));
denom.sigh += 0x80000000; /* set the msb */
Xx.exp = EXP_BIAS; /* needed to prevent errors in div routine */
reg_u_div((long long *)&num.sigl, (long long *)&(denom.sigl), &Xx);
reg_u_div(&num, &denom, &Xx, FULL_PRECISION);
zero = !(Xx.sigh | Xx.sigl);
......@@ -122,7 +124,7 @@ void poly_l2(FPU_REG *arg, FPU_REG *result)
/* Use 1-1/(1-x) = x/(1-x) */
*((long long *)&num.sigl) = - *((long long *)&(arg->sigl));
normalize(&num);
reg_div(&num, arg, &num);
reg_div(&num, arg, &num, FULL_PRECISION);
}
else
{
......@@ -133,12 +135,12 @@ void poly_l2(FPU_REG *arg, FPU_REG *result)
denom.sign = SIGN_POS; /* set the sign to positive */
denom.exp = EXP_BIAS;
reg_div(&num, &denom, &lXx);
reg_div(&num, &denom, &lXx, FULL_PRECISION);
reg_u_mul(&lXx, &accum, &accum);
reg_u_mul(&lXx, &accum, &accum, FULL_PRECISION);
accum.exp += - EXP_BIAS + 1;
reg_u_add(&lXx, &accum, result);
reg_u_add(&lXx, &accum, result, FULL_PRECISION);
normalize(result);
}
......@@ -230,15 +232,15 @@ int poly_l2p1(FPU_REG *arg, FPU_REG *result)
sign = arg->sign;
reg_add(arg, &CONST_1, &arg_pl1);
reg_add(arg, &CONST_1, &arg_pl1, FULL_PRECISION);
if ( (arg_pl1.sign) | (arg_pl1.tag) )
{ /* We need a valid positive number! */
return 1;
}
reg_add(&CONST_1, &arg_pl1, &denom);
reg_div(arg, &denom, &local_arg);
reg_add(&CONST_1, &arg_pl1, &denom, FULL_PRECISION);
reg_div(arg, &denom, &local_arg, FULL_PRECISION);
local_arg.sign = 0; /* Make the sign positive */
/* Now we need to check that |local_arg| is less than
......@@ -273,10 +275,10 @@ int poly_l2p1(FPU_REG *arg, FPU_REG *result)
accum.exp = EXP_BIAS - 1;
normalize(&accum);
reg_u_mul(&local_arg, &accum, &accum);
reg_u_mul(&local_arg, &accum, &accum, FULL_PRECISION);
accum.exp -= EXP_BIAS - 1;
reg_u_add(&local_arg, &accum, result);
reg_u_add(&local_arg, &accum, result, FULL_PRECISION);
/* Multiply the result by 2 */
result->exp++;
......
kernel/FPU-emu/poly_sin.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Computation of an approximation of the sin function by a polynomial |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......@@ -13,6 +14,7 @@
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "control_w.h"
#define HIPOWER 5
......@@ -117,8 +119,8 @@ void poly_sine(FPU_REG *arg, FPU_REG *result)
normalize(result);
reg_mul(result, arg, result);
reg_u_add(result, arg, result);
reg_mul(result, arg, result, FULL_PRECISION);
reg_u_add(result, arg, result, FULL_PRECISION);
/* A small overflow may be possible... but an illegal result. */
if ( result->exp >= EXP_BIAS )
......
kernel/FPU-emu/poly_tan.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Compute the tan of a FPU_REG, using a polynomial approximation. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......@@ -12,6 +13,7 @@
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "control_w.h"
#define HIPOWERop 3 /* odd poly, positive terms */
......@@ -131,8 +133,8 @@ void poly_tan(FPU_REG *arg, FPU_REG *y_reg)
reg_move(&pos_poly, &odd_poly);
normalize(&odd_poly);
reg_mul(&odd_poly, arg, &odd_poly);
reg_u_add(&odd_poly, arg, &odd_poly); /* This is just the odd polynomial */
reg_mul(&odd_poly, arg, &odd_poly, FULL_PRECISION);
reg_u_add(&odd_poly, arg, &odd_poly, FULL_PRECISION); /* This is just the odd polynomial */
/* will be a valid positive nr with expon = 0 */
......@@ -166,14 +168,14 @@ void poly_tan(FPU_REG *arg, FPU_REG *y_reg)
reg_move(&neg_poly, &even_poly);
normalize(&even_poly);
reg_mul(&even_poly, &argSq, &even_poly);
reg_add(&even_poly, &argSq, &even_poly);
reg_sub(&CONST_1, &even_poly, &even_poly); /* This is just the even polynomial */
reg_mul(&even_poly, &argSq, &even_poly, FULL_PRECISION);
reg_add(&even_poly, &argSq, &even_poly, FULL_PRECISION);
reg_sub(&CONST_1, &even_poly, &even_poly, FULL_PRECISION); /* This is just the even polynomial */
/* Now ready to copy the results */
if ( invert )
{ reg_div(&even_poly, &odd_poly, y_reg); }
{ reg_div(&even_poly, &odd_poly, y_reg, FULL_PRECISION); }
else
{ reg_div(&odd_poly, &even_poly, y_reg); }
{ reg_div(&odd_poly, &even_poly, y_reg, FULL_PRECISION); }
}
kernel/FPU-emu/polynomial.S
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Fixed point arithmetic polynomial evaluation. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| Call from C as: |
......@@ -54,9 +55,9 @@ _polynomial:
movl %eax,-28(%ebp)
subl TERM_SIZE,%ecx
js xL_accum_done
js L_accum_done
xL_accum_loop:
L_accum_loop:
xor %eax,%eax
movl %eax,-4(%ebp)
movl %eax,-8(%ebp)
......@@ -107,27 +108,27 @@ xL_accum_loop:
movl %eax,-28(%ebp)
#else
testb $128,-25(%ebp)
je xL_no_poly_round
je L_no_poly_round
addl $1,-24(%ebp)
adcl $0,-20(%ebp)
xL_no_poly_round:
L_no_poly_round:
#endif EXTRA_PRECISE
subl TERM_SIZE,%ecx
jns xL_accum_loop
jns L_accum_loop
xL_accum_done:
L_accum_done:
#ifdef EXTRA_PRECISE
/* And round the result */
testb $128,-25(%ebp)
je xL_poly_done
je L_poly_done
addl $1,-24(%ebp)
adcl $0,-20(%ebp)
#endif EXTRA_PRECISE
xL_poly_done:
L_poly_done:
movl -24(%ebp),%eax
movl %eax,(%esi)
movl -20(%ebp),%eax
......
kernel/FPU-emu/precision.c deleted 100644 → 0
View file @ a2858ced
/*---------------------------------------------------------------------------+
| precision.c |
| |
| The functions which adjust the precision of a result. |
| |
| Copyright (C) 1993 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
+---------------------------------------------------------------------------*/
#include <asm/segment.h>
#include "fpu_system.h"
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "control_w.h"
/* Round the result to 53 bits */
int round_to_53_bits(FPU_REG *reg)
{
if (reg->tag == TW_Valid)
{
unsigned long increment = 0; /* avoid gcc warnings */
switch (control_word & CW_RC)
{
case RC_RND:
/* Rounding can get a little messy.. */
increment = ((reg->sigl & 0x7ff) > 0x400) | /* nearest */
((reg->sigl & 0xc00) == 0xc00); /* odd -> even */
break;
case RC_DOWN: /* towards -infinity */
increment = (reg->sign == SIGN_POS) ? 0 : reg->sigl & 0x7ff;
break;
case RC_UP: /* towards +infinity */
increment = (reg->sign == SIGN_POS) ? reg->sigl & 0x7ff : 0;
break;
case RC_CHOP:
increment = 0;
break;
}
/* Truncate the mantissa */
reg->sigl &= 0xfffff800;
if ( increment )
{
if ( reg->sigl >= 0xfffff800 )
{
/* the sigl part overflows */
if ( reg->sigh == 0xffffffff )
{
/* The sigh part overflows */
reg->sigh = 0x80000000;
reg->exp++;
if (reg->exp >= EXP_OVER)
{ arith_overflow(reg); return 1; }
}
else
{
reg->sigh ++;
}
reg->sigl = 0x00000000;
}
else
{
/* We only need to increment sigl */
reg->sigl += 0x00000800;
}
}
}
return 0;
}
/* Round the result to 24 bits */
int round_to_24_bits(FPU_REG *reg)
{
if (reg->tag == TW_Valid)
{
unsigned long increment = 0; /* avoid gcc warnings */
unsigned long sigh = reg->sigh;
unsigned long sigl = reg->sigl;
switch (control_word & CW_RC)
{
case RC_RND:
increment = ((sigh & 0xff) > 0x80) /* more than half */
|| (((sigh & 0xff) == 0x80) && sigl) /* more than half */
|| ((sigh & 0x180) == 0x180); /* round to even */
break;
case RC_DOWN: /* towards -infinity */
increment = (reg->sign == SIGN_POS) ? 0 : (sigl | (sigh & 0xff));
break;
case RC_UP: /* towards +infinity */
increment = (reg->sign == SIGN_POS) ? (sigl | (sigh & 0xff)) : 0;
break;
case RC_CHOP:
increment = 0;
break;
}
/* Truncate the mantissa */
reg->sigl = 0;
if (increment)
{
if ( sigh >= 0xffffff00 )
{
/* The sigh part overflows */
reg->sigh = 0x80000000;
reg->exp++;
if (reg->exp >= EXP_OVER)
{ arith_overflow(reg); return 1; }
}
else
{
reg->sigh &= 0xffffff00;
reg->sigh += 0x100;
}
}
}
return 0;
}
kernel/FPU-emu/reg_add_sub.c
View file @ 3579bc6f
......@@ -22,7 +22,7 @@
#include "fpu_system.h"
void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest, int control_w)
{
int diff;
......@@ -32,7 +32,7 @@ void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
if (!(a->sign ^ b->sign))
{
/* signs are the same */
reg_u_add(a, b, dest);
reg_u_add(a, b, dest, control_w);
dest->sign = a->sign;
return;
}
......@@ -52,19 +52,19 @@ void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
if (diff > 0)
{
reg_u_sub(a, b, dest);
reg_u_sub(a, b, dest, control_w);
dest->sign = a->sign;
}
else if ( diff == 0 )
{
reg_move(&CONST_Z, dest);
/* sign depends upon rounding mode */
dest->sign = ((control_word & CW_RC) != RC_DOWN)
dest->sign = ((control_w & CW_RC) != RC_DOWN)
? SIGN_POS : SIGN_NEG;
}
else
{
reg_u_sub(b, a, dest);
reg_u_sub(b, a, dest, control_w);
dest->sign = b->sign;
}
return;
......@@ -84,7 +84,7 @@ void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
{
/* Signs are different. */
/* Sign of answer depends upon rounding mode. */
dest->sign = ((control_word & CW_RC) != RC_DOWN)
dest->sign = ((control_w & CW_RC) != RC_DOWN)
? SIGN_POS : SIGN_NEG;
}
}
......@@ -114,7 +114,7 @@ void reg_add(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
/* Subtract b from a. (a-b) -> dest */
void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest, int control_w)
{
int diff;
......@@ -139,28 +139,28 @@ void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
case 3: /* N - N */
if (diff > 0)
{
reg_u_sub(a, b, dest);
reg_u_sub(a, b, dest, control_w);
dest->sign = a->sign;
}
else if ( diff == 0 )
{
reg_move(&CONST_Z, dest);
/* sign depends upon rounding mode */
dest->sign = ((control_word & CW_RC) != RC_DOWN)
dest->sign = ((control_w & CW_RC) != RC_DOWN)
? SIGN_POS : SIGN_NEG;
}
else
{
reg_u_sub(b, a, dest);
reg_u_sub(b, a, dest, control_w);
dest->sign = a->sign ^ SIGN_POS^SIGN_NEG;
}
return;
case 1: /* P - N */
reg_u_add(a, b, dest);
reg_u_add(a, b, dest, control_w);
dest->sign = SIGN_POS;
return;
case 2: /* N - P */
reg_u_add(a, b, dest);
reg_u_add(a, b, dest, control_w);
dest->sign = SIGN_NEG;
return;
}
......@@ -179,7 +179,7 @@ void reg_sub(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
if (same_signs)
{
/* Sign depends upon rounding mode */
dest->sign = ((control_word & CW_RC) != RC_DOWN)
dest->sign = ((control_w & CW_RC) != RC_DOWN)
? SIGN_POS : SIGN_NEG;
}
}
......
kernel/FPU-emu/reg_constant.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| All of the constant FPU_REGs |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......
kernel/FPU-emu/reg_div.S
View file @ 3579bc6f
......@@ -4,11 +4,13 @@
| |
| Divide one FPU_REG by another and put the result in a destination FPU_REG.|
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| Call from C as: |
| void reg_div(FPU_REG *a, FPU_REG *b, FPU_REG *dest) |
| void reg_div(FPU_REG *a, FPU_REG *b, FPU_REG *dest, |
| unsigned int control_word) |
| |
+---------------------------------------------------------------------------*/
......@@ -34,7 +36,7 @@ _reg_div:
movb TAG(%esi),%al
orb TAG(%ebx),%al
jne xL_div_special // Not (both numbers TW_Valid)
jne L_div_special // Not (both numbers TW_Valid)
// Both arguments are TW_Valid
......@@ -50,72 +52,72 @@ _reg_div:
cmpb %cl,SIGN(%ebx)
setne (%edi) // Set the sign, requires SIGN_NEG=1, SIGN_POS=0
add $SIGL_OFFSET,%ebx
add $SIGL_OFFSET,%esi
// add $SIGL_OFFSET,%ebx
// add $SIGL_OFFSET,%esi
jmp _divide_kernel
/*-----------------------------------------------------------------------*/
xL_div_special:
L_div_special:
cmpb TW_NaN,TAG(%esi) // A NaN with anything to give NaN
je xL_arg1_NaN
je L_arg1_NaN
cmpb TW_NaN,TAG(%ebx) // A NaN with anything to give NaN
jne xL_no_NaN_arg
jne L_no_NaN_arg
// Operations on NaNs
xL_arg1_NaN:
xL_arg2_NaN:
L_arg1_NaN:
L_arg2_NaN:
pushl %edi
pushl %ebx
pushl %esi
call _real_2op_NaN
jmp xL78
jmp LDiv_exit
// Invalid operations
xL_zero_zero:
xL_inf_inf:
L_zero_zero:
L_inf_inf:
pushl %esi
call _arith_invalid
jmp xL78
jmp LDiv_exit
xL_no_NaN_arg:
L_no_NaN_arg:
cmpb TW_Infinity,TAG(%esi)
jne xL_arg1_not_inf
jne L_arg1_not_inf
cmpb TW_Infinity,TAG(%ebx)
je xL_inf_inf // invalid operation
je L_inf_inf // invalid operation
// Note that p16-9 says that infinity/0 returns infinity
jmp xL_copy_arg1 // Answer is Inf
jmp L_copy_arg1 // Answer is Inf
xL_arg1_not_inf:
cmpb TW_Zero,TAG(%ebx) // Priority to div-by-zero error
jne xL_arg2_not_zero
L_arg1_not_inf:
cmpb TW_Zero,TAG(%ebx) // Priority to div-by-zero error
jne L_arg2_not_zero
cmpb TW_Zero,TAG(%esi)
je xL_zero_zero // invalid operation
je L_zero_zero // invalid operation
// Division by zero error
pushl %esi
movb SIGN(%esi),%al
xorb SIGN(%ebx),%al
pushl %eax // lower 8 bits have the sign
pushl %eax // lower 8 bits have the sign
call _divide_by_zero
jmp xL78
jmp LDiv_exit
xL_arg2_not_zero:
L_arg2_not_zero:
cmpb TW_Infinity,TAG(%ebx)
jne xL_arg2_not_inf
jne L_arg2_not_inf
jmp xL_return_zero // Answer is zero
jmp L_return_zero // Answer is zero
xL_arg2_not_inf:
L_arg2_not_inf:
cmpb TW_Zero,TAG(%esi)
jne xL_unknown_tags
jne L_unknown_tags
xL_copy_arg1:
L_copy_arg1:
movb TAG(%esi),%ax
movb %ax,TAG(%edi)
movl EXP(%esi),%eax
......@@ -127,24 +129,24 @@ xL_copy_arg1:
movb SIGN(%esi),%cl
cmpb %cl,SIGN(%ebx)
jne xL76
jne LDiv_negative_result
movb SIGN_POS,SIGN(%edi)
jmp xL78
jmp LDiv_exit
xL71:
LDiv_set_result_sign:
movb SIGN(%esi),%cl
cmpb %cl,SIGN(%edi)
jne xL76
jne LDiv_negative_result
movb SIGN_POS,SIGN(%ebx)
jmp xL78
jmp LDiv_exit
.align 2,0x90
xL76:
LDiv_negative_result:
movb SIGN_NEG,SIGN(%edi)
xL78:
LDiv_exit:
leal -12(%ebp),%esp
popl %ebx
......@@ -154,11 +156,11 @@ xL78:
ret
xL_return_zero:
L_return_zero:
movb TW_Zero,TAG(%edi)
jmp xL71
jmp LDiv_set_result_sign
xL_unknown_tags:
L_unknown_tags:
push EX_INTERNAL | 0x208
call EXCEPTION
......@@ -169,4 +171,4 @@ xL_unknown_tags:
movl %eax,SIGL(%edi)
movl _CONST_QNaN+8,%eax
movl %eax,SIGH(%edi)
jmp xL78
jmp LDiv_exit
kernel/FPU-emu/reg_ld_str.c
View file @ 3579bc6f
......@@ -503,22 +503,73 @@ int reg_store_double(void)
double *dfloat = (double *)FPU_data_address;
unsigned long l[2];
if (FPU_st0_tag == TW_Valid)
{
int exp;
FPU_REG tmp;
reg_move(FPU_st0_ptr, &tmp);
if (round_to_53_bits(&tmp)) goto overflow;
if ( tmp.sigl & 0x000007ff )
{
unsigned long increment = 0; /* avoid gcc warnings */
switch (control_word & CW_RC)
{
case RC_RND:
/* Rounding can get a little messy.. */
increment = ((tmp.sigl & 0x7ff) > 0x400) | /* nearest */
((tmp.sigl & 0xc00) == 0xc00); /* odd -> even */
break;
case RC_DOWN: /* towards -infinity */
increment = (tmp.sign == SIGN_POS) ? 0 : tmp.sigl & 0x7ff;
break;
case RC_UP: /* towards +infinity */
increment = (tmp.sign == SIGN_POS) ? tmp.sigl & 0x7ff : 0;
break;
case RC_CHOP:
increment = 0;
break;
}
/* Truncate the mantissa */
tmp.sigl &= 0xfffff800;
if ( increment )
{
if ( tmp.sigl >= 0xfffff800 )
{
/* the sigl part overflows */
if ( tmp.sigh == 0xffffffff )
{
/* The sigh part overflows */
tmp.sigh = 0x80000000;
tmp.exp++;
if (tmp.exp >= EXP_OVER)
goto overflow;
}
else
{
tmp.sigh ++;
}
tmp.sigl = 0x00000000;
}
else
{
/* We only need to increment sigl */
tmp.sigl += 0x00000800;
}
}
}
l[0] = (tmp.sigl >> 11) | (tmp.sigh << 21);
l[1] = ((tmp.sigh >> 11) & 0xfffff);
exp = tmp.exp - EXP_BIAS;
if ( exp > DOUBLE_Emax )
{
EXCEPTION(EX_Overflow);
overflow:
EXCEPTION(EX_Overflow);
/* This is a special case: see sec 16.2.5.1 of the 80486 book */
if ( control_word & EX_Overflow )
{
......@@ -635,14 +686,61 @@ int reg_store_single(void)
FPU_REG tmp;
reg_move(FPU_st0_ptr, &tmp);
if (round_to_24_bits(&tmp)) goto overflow;
if ( tmp.sigl | (tmp.sigh & 0x000000ff) )
{
unsigned long increment = 0; /* avoid gcc warnings */
unsigned long sigh = tmp.sigh;
unsigned long sigl = tmp.sigl;
switch (control_word & CW_RC)
{
case RC_RND:
increment = ((sigh & 0xff) > 0x80) /* more than half */
|| (((sigh & 0xff) == 0x80) && sigl) /* more than half */
|| ((sigh & 0x180) == 0x180); /* round to even */
break;
case RC_DOWN: /* towards -infinity */
increment = (tmp.sign == SIGN_POS) ? 0 : (sigl | (sigh & 0xff));
break;
case RC_UP: /* towards +infinity */
increment = (tmp.sign == SIGN_POS) ? (sigl | (sigh & 0xff)) : 0;
break;
case RC_CHOP:
increment = 0;
break;
}
/* Truncate part of the mantissa */
tmp.sigl = 0;
if (increment)
{
if ( sigh >= 0xffffff00 )
{
/* The sigh part overflows */
tmp.sigh = 0x80000000;
tmp.exp++;
if (tmp.exp >= EXP_OVER)
goto overflow;
}
else
{
tmp.sigh &= 0xffffff00;
tmp.sigh += 0x100;
}
}
else
tmp.sigh &= 0xffffff00; /* Finish the truncation */
}
templ = (tmp.sigh >> 8) & 0x007fffff;
exp = tmp.exp - EXP_BIAS;
if ( exp > SINGLE_Emax )
{
EXCEPTION(EX_Overflow);
overflow:
EXCEPTION(EX_Overflow);
/* This is a special case: see sec 16.2.5.1 of the 80486 book */
if ( control_word & EX_Overflow )
{
......
kernel/FPU-emu/reg_mul.c
View file @ 3579bc6f
......@@ -3,7 +3,8 @@
| |
| Multiply one FPU_REG by another, put the result in a destination FPU_REG. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| |
......@@ -16,18 +17,19 @@
#include "exception.h"
#include "reg_constant.h"
#include "fpu_emu.h"
#include "fpu_system.h"
/* This routine must be called with non-empty registers */
void reg_mul(FPU_REG *a, FPU_REG *b, FPU_REG *dest)
/* This routine must be called with non-empty source registers */
void reg_mul(FPU_REG *a, FPU_REG *b, FPU_REG *dest, unsigned int control_w)
{
if (!(a->tag | b->tag))
{
/* This should be the most common case */
reg_u_mul(a, b, dest);
dest->exp += - EXP_BIAS + 1;
dest->sign = (a->sign ^ b->sign);
dest->tag = TW_Valid;
reg_u_mul(a, b, dest, control_w);
dest->exp += - EXP_BIAS + 1;
/* dest->tag = TW_Valid; ****** */
if ( dest->exp <= EXP_UNDER )
{ arith_underflow(FPU_st0_ptr); }
else if ( dest->exp >= EXP_OVER )
......
kernel/FPU-emu/reg_round.S 0 → 100644
View file @ 3579bc6f
.file "reg_round.S"
/*---------------------------------------------------------------------------+
| reg_round.S |
| |
| Rounding/truncation/etc for FPU basic arithmetic functions. |
| |
| Copyright (C) 1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| Not callable from C. |
| Must be entered by a jmp intruction. |
| |
+---------------------------------------------------------------------------*/
/*---------------------------------------------------------------------------+
| Two entry points. |
| |
| Needed by both entry points: |
| %eax:%ebx 64 bit significand |
| %edx 32 bit extension of the significand |
| %edi pointer to an FPU_REG for the result to be stored |
| stack calling function must have set up a C stack frame and |
| pushed %esi, %edi, and %ebx |
| |
| Needed just for the FPU_round_sqrt entry point: |
| %cx A control word in the same format as the FPU control word. |
| Otherwise, PARAM4 must give such a value. |
| |
| |
| The significand and its extension are assumed to be exact in the |
| following sense: |
| If the significand by itself is the exact result then the significand |
| extension (%edx) must contain 0, otherwise the significand extension |
| must be non-zero. |
| If the significand extension is non-zero then the significand is |
| smaller than the magnitude of the correct exact result by an amount |
| greater than zero and less than one ls bit of the significand. |
| The significand extension is only required to have three possible |
| non-zero values: |
| less than 0x80000000 <=> the significand is less than 1/2 an ls |
| bit smaller than the magnitude of the |
| true exact result. |
| exactly 0x80000000 <=> the significand is exactly 1/2 an ls bit |
| smaller than the magnitude of the true |
| exact result. |
| greater than 0x80000000 <=> the significand is more than 1/2 an ls |
| bit smaller than the magnitude of the |
| true exact result. |
| |
+---------------------------------------------------------------------------*/
#include "fpu_asm.h"
#include "fpu_emu.h"
#include "exception.h"
#include "control_w.h"
.text
.align 2,144
.globl FPU_round
.globl FPU_round_sqrt
FPU_round:
/* Round the result */
movl PARAM4,%ecx
FPU_round_sqrt: // entry point from wm_sqrt.S
movl %ecx,%esi
andl CW_PC,%ecx
cmpl PR_64_BITS,%ecx
je LRound_To_64
cmpl PR_53_BITS,%ecx
je LRound_To_53
cmpl PR_24_BITS,%ecx
je LRound_To_24
#ifdef PARANOID
jmp L_bugged // There is no bug, just a bad control word
#endif PARANOID
LRound_To_24:
movl %esi,%ecx
andl CW_RC,%ecx
cmpl RC_RND,%ecx
je LRound_nearest_24
cmpl RC_CHOP,%ecx
je LTruncate_24
cmpl RC_UP,%ecx // Towards +infinity
je LUp_24
cmpl RC_DOWN,%ecx // Towards -infinity
je LDown_24
#ifdef PARANOID
jmp L_bugged
#endif PARANOID
LUp_24:
cmpb SIGN_POS,SIGN(%edi)
je LUp_24_pos
movl %eax,%ecx
andl $0x000000ff,%ecx
orl %ebx,%ecx
orl %edx,%ecx
jnz LTruncate_24
jmp L_store
LUp_24_pos:
movl %eax,%ecx
andl $0x000000ff,%ecx
orl %ebx,%ecx
orl %edx,%ecx
jnz LDo_24_round_up
jmp L_store
LDown_24:
cmpb SIGN_POS,SIGN(%edi)
je LDown_24_pos
movl %eax,%ecx
andl $0x000000ff,%ecx
orl %ebx,%ecx
orl %edx,%ecx
jnz LDo_24_round_up
jmp L_store
LDown_24_pos:
movl %eax,%ecx
andl $0x000000ff,%ecx
orl %ebx,%ecx
orl %edx,%ecx
jnz LTruncate_24
jmp L_store
LRound_nearest_24:
// Do rounding of the 24th bit if needed (nearest or even)
movl %eax,%ecx
andl $0x000000ff,%ecx
cmpl $0x00000080,%ecx
jc LTruncate_24 // less than half, no increment needed
jne LGreater_Half_24 // greater than half, increment needed
// Possibly half, we need to check the ls bits
orl %ebx,%ebx
jne LGreater_Half_24 // greater than half, increment needed
orl %edx,%edx
jne LGreater_Half_24 // greater than half, increment needed
// Exactly half, increment only if 24th bit is 1 (round to even)
testl $0x00000100,%eax
jz LTruncate_24
LGreater_Half_24: // Rounding: increment at the 24th bit
LDo_24_round_up:
andl $0xffffff00,%eax // Truncate to 24 bits
xorl %ebx,%ebx
addl $0x00000100,%eax
jmp LCheck_Round_Overflow
LTruncate_24:
andl $0xffffff00,%eax // Truncate to 24 bits
xorl %ebx,%ebx
jmp L_store
LRound_To_53:
movl %esi,%ecx
andl CW_RC,%ecx
cmpl RC_RND,%ecx
je LRound_nearest_53
cmpl RC_CHOP,%ecx
je LTruncate_53
cmpl RC_UP,%ecx // Towards +infinity
je LUp_53
cmpl RC_DOWN,%ecx // Towards -infinity
je LDown_53
#ifdef PARANOID
jmp L_bugged
#endif PARANOID
LUp_53:
cmpb SIGN_POS,SIGN(%edi)
je LUp_53_pos
movl %ebx,%ecx
andl $0x000007ff,%ecx
orl %edx,%ecx
jnz LTruncate_53
jmp L_store
LUp_53_pos:
movl %ebx,%ecx
andl $0x000007ff,%ecx
orl %edx,%ecx
jnz LDo_53_round_up
jmp L_store
LDown_53:
cmpb SIGN_POS,SIGN(%edi)
je LDown_53_pos
movl %ebx,%ecx
andl $0x000007ff,%ecx
orl %edx,%ecx
jnz LDo_53_round_up
jmp L_store
LDown_53_pos:
movl %ebx,%ecx
andl $0x000007ff,%ecx
orl %edx,%ecx
jnz LTruncate_53
jmp L_store
LRound_nearest_53:
// Do rounding of the 53rd bit if needed (nearest or even)
movl %ebx,%ecx
andl $0x000007ff,%ecx
cmpl $0x00000400,%ecx
jc LTruncate_53 // less than half, no increment needed
jne LGreater_Half_53 // greater than half, increment needed
// Possibly half, we need to check the ls bits
orl %edx,%edx
jne LGreater_Half_53 // greater than half, increment needed
// Exactly half, increment only if 53rd bit is 1 (round to even)
testl $0x00000800,%ebx
jz LTruncate_53
LGreater_Half_53: // Rounding: increment at the 53rd bit
LDo_53_round_up:
andl $0xfffff800,%ebx // Truncate to 53 bits
addl $0x00000800,%ebx
adcl $0,%eax
jmp LCheck_Round_Overflow
LTruncate_53:
andl $0xfffff800,%ebx // Truncate to 53 bits
jmp L_store
LRound_To_64:
movl %esi,%ecx
andl CW_RC,%ecx
cmpl RC_RND,%ecx
je LRound_nearest_64
cmpl RC_CHOP,%ecx
je LTruncate_64
cmpl RC_UP,%ecx // Towards +infinity
je LUp_64
cmpl RC_DOWN,%ecx // Towards -infinity
je LDown_64
#ifdef PARANOID
jmp L_bugged
#endif PARANOID
LUp_64:
cmpb SIGN_POS,SIGN(%edi)
je LUp_64_pos
orl %edx,%edx
jnz LTruncate_64
jmp L_store
LUp_64_pos:
orl %edx,%edx
jnz LDo_64_round_up
jmp L_store
LDown_64:
cmpb SIGN_POS,SIGN(%edi)
je LDown_64_pos
orl %edx,%edx
jnz LDo_64_round_up
jmp L_store
LDown_64_pos:
orl %edx,%edx
jnz LTruncate_64
jmp L_store
LRound_nearest_64:
cmpl $0x80000000,%edx
jc LTruncate_64
jne LDo_64_round_up
/* Now test for round-to-even */
testb $1,%ebx
jz LTruncate_64
LDo_64_round_up:
addl $1,%ebx
adcl $0,%eax
LCheck_Round_Overflow:
jnc L_store /* Rounding done, no overflow */
/* Overflow, adjust the result (to 1.0) */
rcrl $1,%eax
rcrl $1,%ebx
incl EXP(%edi)
LTruncate_64:
L_store:
/* store the result */
movl %eax,SIGH(%edi)
movl %ebx,SIGL(%edi)
movb TW_Valid,TAG(%edi) /* Set the tags to TW_Valid */
// The number may have overflowed
cmpl EXP_OVER,EXP(%edi)
jge L_overflow
cmpl EXP_UNDER,EXP(%edi)
jle L_underflow
L_exit:
popl %ebx
popl %edi
popl %esi
leave
ret
/* The operations resulted in a number too large to represent */
L_overflow:
push %edi
call _arith_overflow
pop %edi
jmp L_exit
/* The operations resulted in a number too small to represent */
L_underflow:
pushl %edi
call _arith_underflow
popl %edi
jmp L_exit
#ifdef PARANOID
/* If we ever get here then we have problems! */
L_bugged:
pushl EX_INTERNAL|0x201
call EXCEPTION
pop %ebx
jmp L_exit
#endif PARANOID
kernel/FPU-emu/reg_u_add.S
View file @ 3579bc6f
......@@ -5,11 +5,13 @@
| Add two valid (TW_Valid) FPU_REG numbers, of the same sign, and put the |
| result in a destination FPU_REG. |
| |
| Copyright (C) 1992 W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Copyright (C) 1992,1993 |
| W. Metzenthen, 22 Parker St, Ormond, Vic 3163, |
| Australia. E-mail apm233m@vaxc.cc.monash.edu.au |
| |
| Call from C as: |
| void reg_u_add(reg *arg1, reg *arg2, reg *answ) |
| void reg_u_add(FPU_REG *arg1, FPU_REG *arg2, FPU_REG *answ, |
| int control_w) |
| |
+---------------------------------------------------------------------------*/
......@@ -24,6 +26,7 @@
#include "exception.h"
#include "fpu_asm.h"
#include "control_w.h"
.text
.align 2,144
......@@ -59,7 +62,10 @@ L_arg1_larger:
movl SIGH(%edi),%eax
L_accum_loaded:
movl 16(%ebp),%edi /* destination */
movl PARAM3,%edi /* destination */
movb SIGN(%esi),%dl
movb %dl,SIGN(%edi) /* Copy the sign from the first arg */
movl EXP(%esi),%edx
movl %edx,EXP(%edi) /* Copy exponent to destination */
......@@ -74,6 +80,7 @@ L_accum_loaded:
je L_bugged
#endif PARANOID
// The number to be shifted is in %eax:%ebx:%edx
cmpw $32,%cx /* shrd only works for 0..31 bits */
jnc L_more_than_31
......@@ -88,32 +95,43 @@ L_more_than_31:
jnc L_more_than_63
subb $32,%cl
jz L_exactly_32
shrd %cl,%eax,%edx
shr %cl,%eax
orl %ebx,%ebx
jz L_more_31_no_low // none of the lowest bits is set
orl $1,%edx // record the fact in the extension
L_more_31_no_low:
movl %eax,%ebx
xorl %eax,%eax
jmp L_shift_done
L_exactly_32:
movl %ebx,%edx
movl %eax,%ebx
xorl %eax,%eax
jmp L_shift_done
L_more_than_63:
cmpw $66,%cx
jnc L_more_than_65
cmpw $65,%cx
jnc L_more_than_64
subb $64,%cl
movl %eax,%edx
shr %cl,%edx
orl %ebx,%ebx
jz L_more_63_no_low
orl $1,%edx
jmp L_more_63_no_low
L_more_than_64:
movl $1,%edx // The shifted nr always at least one '1'
L_more_63_no_low:
xorl %ebx,%ebx
xorl %eax,%eax
jmp L_shift_done
L_more_than_65:
/* just copy the larger reg to dest */
movw SIGN(%esi),%ax
movw %ax,SIGN(%edi)
movl SIGL(%esi),%eax
movl %eax,SIGL(%edi)
movl SIGH(%esi),%eax
movl %eax,SIGH(%edi)
jmp L_exit // Does not overflow
L_shift_done:
/* Now do the addition */
......@@ -125,56 +143,16 @@ L_shift_done:
rcrl $1,%eax
rcrl $1,%ebx
rcrl $1,%edx
jnc L_no_bit_lost
incl EXP(%edi)
L_round_the_result:
/* Round the result */
cmpl $0x80000000,%edx
jc L_no_round_up
jne L_do_round_up
/* Now test for round-to-even */
testb $1,%ebx
jz L_no_round_up
L_do_round_up:
addl $1,%ebx
adcl $0,%eax
jnc L_no_round_up /* Rounding done, no overflow */
orl $1,%edx
/* Overflow, adjust the result */
rcrl $1,%eax
rcrl $1,%ebx
L_no_bit_lost:
incl EXP(%edi)
L_no_round_up:
/* store the result */
movl %eax,SIGH(%edi)
movl %ebx,SIGL(%edi)
L_round_the_result:
jmp FPU_round // Round the result
movb TW_Valid,TAG(%edi) /* Set the tags to TW_Valid */
movb SIGN(%esi),%al
movb %al,SIGN(%edi) /* Copy the sign from the first arg */
// The number may have overflowed
cmpl EXP_OVER,EXP(%edi)
jge L_overflow
L_exit:
popl %ebx
popl %edi
popl %esi
leave
ret
/* The addition resulted in a number too large to represent */
L_overflow:
push %edi
call _arith_overflow
pop %ebx
jmp L_exit
#ifdef PARANOID
......@@ -185,3 +163,11 @@ L_bugged:
pop %ebx
jmp L_exit
#endif PARANOID
L_exit:
popl %ebx
popl %edi
popl %esi
leave
ret
kernel/FPU-emu/reg_u_div.S
View file @ 3579bc6f
This diff is collapsed.
kernel/FPU-emu/reg_u_mul.S
View file @ 3579bc6f
This diff is collapsed.
kernel/FPU-emu/reg_u_sub.S
View file @ 3579bc6f
This diff is collapsed.
kernel/FPU-emu/version.h
View file @ 3579bc6f
......@@ -9,5 +9,5 @@
| |
+---------------------------------------------------------------------------*/
#define FPU_VERSION "wm-FPU-emu version BETA 1.2"
#define FPU_VERSION "wm-FPU-emu version BETA 1.3"
kernel/FPU-emu/wm_sqrt.S
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/floppy.c
View file @ 3579bc6f
......@@ -1031,7 +1031,7 @@ void do_fd_request(void)
}
static int fd_ioctl(struct inode *inode, struct file *filp, unsigned int cmd,
unsigned int param)
unsigned long param)
{
int i,drive,cnt,okay;
struct floppy_struct *this;
......
kernel/blk_drv/hd.c
View file @ 3579bc6f
......@@ -305,6 +305,8 @@ static void read_intr(void)
do {
i = (unsigned) inb_p(HD_STATUS);
if (i & BUSY_STAT)
continue;
if ((i & STAT_MASK) != STAT_OK)
break;
if (i & DRQ_STAT)
......@@ -354,6 +356,8 @@ static void write_intr(void)
do {
i = (unsigned) inb_p(HD_STATUS);
if (i & BUSY_STAT)
continue;
if ((i & STAT_MASK) != STAT_OK)
break;
if ((CURRENT->nr_sectors <= 1) || (i & DRQ_STAT))
......@@ -503,7 +507,7 @@ static void do_hd_request(void)
}
static int hd_ioctl(struct inode * inode, struct file * file,
unsigned int cmd, unsigned int arg)
unsigned int cmd, unsigned long arg)
{
struct hd_geometry *loc = (void *) arg;
int dev, err;
......
kernel/blk_drv/scsi/aha1542.c
View file @ 3579bc6f
......@@ -66,8 +66,7 @@ static int aha1542_last_mbo_used = (AHA1542_MAILBOXES - 1);
static long WAITnexttimeout = 3000000;
static int aha1542_host = 0;
static void setup_mailboxes();
extern void aha1542_interrupt();
static void setup_mailboxes(void);
#define aha1542_intr_reset() outb(IRST, CONTROL)
......@@ -530,7 +529,7 @@ int aha1542_command(Scsi_Cmnd * SCpnt)
}
/* Initialize mailboxes */
static void setup_mailboxes()
static void setup_mailboxes(void)
{
int i;
static unchar cmd[5] = {CMD_MBINIT, AHA1542_MAILBOXES};
......
kernel/blk_drv/scsi/scsi.c
View file @ 3579bc6f
......@@ -193,6 +193,8 @@ static void scan_scsis (void)
SCmd.request.dev = 0xffff; /* Mark not busy */
SCmd.use_sg = 0;
SCmd.transfersize = 0;
SCmd.underflow = 0;
scsi_do_cmd (&SCmd,
(void *) scsi_cmd, (void *)
......@@ -445,6 +447,8 @@ Scsi_Cmnd * request_queueable (struct request * req, int index)
};
SCpnt->use_sg = 0; /* Reset the scatter-gather flag */
SCpnt->transfersize = 0;
SCpnt->underflow = 0;
return SCpnt;
}
......@@ -516,6 +520,8 @@ Scsi_Cmnd * allocate_device (struct request ** reqp, int index, int wait)
};
SCpnt->use_sg = 0; /* Reset the scatter-gather flag */
SCpnt->transfersize = 0; /* No default transfer size */
SCpnt->underflow = 0; /* Do not flag underflow conditions */
return SCpnt;
}
......@@ -929,7 +935,8 @@ static void scsi_done (Scsi_Cmnd * SCpnt)
}
break;
default:
panic ("unsupported message byte recieved.");
printk("scsi: unsupported message byte %d recieved\n", msg_byte(result));
panic ("");
}
break;
case DID_TIME_OUT:
......@@ -1387,6 +1394,8 @@ unsigned long scsi_dev_init (unsigned long memory_start,unsigned long memory_end
SCpnt->index = i;
SCpnt->request.dev = -1; /* Mark not busy */
SCpnt->use_sg = 0;
SCpnt->underflow = 0;
SCpnt->transfersize = 0;
host = scsi_devices[i].host_no;
if(host_queue[host])
host_queue[host]->prev = SCpnt;
......
kernel/blk_drv/scsi/scsi.h
View file @ 3579bc6f
......@@ -351,11 +351,20 @@ typedef struct scsi_cmnd {
void * request_buffer; /* Actual requested buffer */
/* These elements define the operation we ultimately want to perform */
unsigned char data_cmnd[10];
unsigned char data_cmnd[12];
unsigned short use_sg; /* Number of pieces of scatter-gather */
unsigned short sglist_len; /* size of malloc'd scatter-gather list */
unsigned bufflen; /* Size of data buffer */
void *buffer; /* Data buffer */
unsigned underflow; /* Return error if less than this amount is
transfered */
unsigned transfersize; /* How much we are guranteed to transfer with
each SCSI transfer (ie, between disconnect /
reconnects. Probably == sector size */
struct request request; /* A copy of the command we are working on*/
......
kernel/blk_drv/scsi/scsi_ioctl.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/sd.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/sd_ioctl.c
View file @ 3579bc6f
......@@ -14,7 +14,7 @@
extern int scsi_ioctl (Scsi_Device *dev, int cmd, void *arg);
extern int revalidate_scsidisk(int, int);
int sd_ioctl(struct inode * inode, struct file * file, unsigned long cmd, unsigned long arg)
int sd_ioctl(struct inode * inode, struct file * file, unsigned int cmd, unsigned long arg)
{
int dev = inode->i_rdev;
int host, error;
......
kernel/blk_drv/scsi/seagate.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/seagate.h
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/sr.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/sr_ioctl.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/st.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/ultrastor.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/scsi/wd7000.c
View file @ 3579bc6f
This diff is collapsed.
kernel/blk_drv/xd.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/console.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/keyboard.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/lp.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/serial.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/tty_io.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/tty_ioctl.c
View file @ 3579bc6f
This diff is collapsed.
kernel/chr_drv/vt.c
View file @ 3579bc6f
This diff is collapsed.
kernel/exit.c
View file @ 3579bc6f
This diff is collapsed.
kernel/fork.c
View file @ 3579bc6f
This diff is collapsed.
kernel/printk.c
View file @ 3579bc6f
This diff is collapsed.
kernel/sched.c
View file @ 3579bc6f
This diff is collapsed.
kernel/signal.c
View file @ 3579bc6f
This diff is collapsed.
kernel/sys.c
View file @ 3579bc6f
This diff is collapsed.
kernel/sys_call.S
View file @ 3579bc6f
This diff is collapsed.
mm/memory.c
View file @ 3579bc6f
This diff is collapsed.
mm/swap.c
View file @ 3579bc6f
This diff is collapsed.
net/socket.c
View file @ 3579bc6f
This diff is collapsed.
net/tcp/packet.c
View file @ 3579bc6f
This diff is collapsed.
net/tcp/udp.c
View file @ 3579bc6f
This diff is collapsed.
net/tcp/we.c
View file @ 3579bc6f
This diff is collapsed.
net/unix.c
View file @ 3579bc6f
This diff is collapsed.
zBoot/Makefile
View file @ 3579bc6f
This diff is collapsed.
zBoot/inflate.c
View file @ 3579bc6f
This diff is collapsed.
zBoot/misc.c
View file @ 3579bc6f
This diff is collapsed.
zBoot/piggyback.c
View file @ 3579bc6f
This diff is collapsed.
zBoot/unzip.c
View file @ 3579bc6f
This diff is collapsed.
zBoot/xtract.c
View file @ 3579bc6f
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7