Mercurial > hg > CbC > CbC_xv6
changeset 338:2cbaa4c74d15
remove_skip
author | anatofuz |
---|---|
date | Sun, 16 Feb 2020 18:30:06 +0900 |
parents | cb6045bce1d5 |
children | 75df4b25f6a5 |
files | src/impl/fs_impl.cbc src/impl/fs_impl_private.cbc src/impl/vm_impl.cbc src/impl/vm_impl_private.cbc |
diffstat | 4 files changed, 19 insertions(+), 19 deletions(-) [+] |
line wrap: on
line diff
--- a/src/impl/fs_impl.cbc Sat Feb 15 21:35:56 2020 +0900 +++ b/src/impl/fs_impl.cbc Sun Feb 16 18:30:06 2020 +0900 @@ -88,7 +88,7 @@ } typedef struct superblock superblock; -__code readsbfs_impl(struct fs_impl* fs, uint dev, struct superblock* sb, __code next(...)) { //:skip +__code readsbfs_impl(struct fs_impl* fs, uint dev, struct superblock* sb, __code next(...)) { struct buf* bp; @@ -184,7 +184,7 @@ } typedef struct stat stat; -__code statifs_impl(struct fs_impl* fs , struct inode* ip, struct stat* st, __code next(...)) { //:skip +__code statifs_impl(struct fs_impl* fs , struct inode* ip, struct stat* st, __code next(...)) { st->dev = ip->dev; st->ino = ip->inum; st->type = ip->type; @@ -234,7 +234,7 @@ goto next(strncmp_val, ...); } -__code dirlookupfs_impl(struct fs_impl* fs, struct inode* dp, char* name, uint off, uint* poff, dirent* de, __code next(...)) { //:skip +__code dirlookupfs_impl(struct fs_impl* fs, struct inode* dp, char* name, uint off, uint* poff, dirent* de, __code next(...)) { if (dp->type != T_DIR) { char* msg = "dirlookup not DIR"; struct Err* err = createKernelError(&proc->cbc_context); @@ -245,7 +245,7 @@ goto dirlookup_loopcheck(fs, dp, name, off, poff, de, next(...)); } -__code dirlinkfs_impl(struct fs_impl* fs, struct inode* ip, struct dirent* de, struct inode* dp, char* name, uint off, uint inum, __code next(...)) { //:skip +__code dirlinkfs_impl(struct fs_impl* fs, struct inode* ip, struct dirent* de, struct inode* dp, char* name, uint off, uint inum, __code next(...)) { // Check that name is not present. if ((ip = dirlookup(dp, name, 0)) != 0) { goto dirlink_namecheck(fs, ip, next(...));
--- a/src/impl/fs_impl_private.cbc Sat Feb 15 21:35:56 2020 +0900 +++ b/src/impl/fs_impl_private.cbc Sun Feb 16 18:30:06 2020 +0900 @@ -16,7 +16,7 @@ fs_impl* createfs_impl2(); */ -__code allocinode(struct fs_impl* fs_impl, uint dev, struct superblock* sb, __code next(...)){ //:skip +__code allocinode(struct fs_impl* fs_impl, uint dev, struct superblock* sb, __code next(...)){ readsb(dev, sb); Gearef(cbc_context, fs_impl)->inum = 1; @@ -28,7 +28,7 @@ typedef struct dinode dinode; typedef struct inode inode; -__code allocinode_loopcheck(struct fs_impl* fs_impl, uint inum, uint dev, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...)){ //:skip +__code allocinode_loopcheck(struct fs_impl* fs_impl, uint inum, uint dev, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...)){ if( inum < sb->ninodes){ goto allocinode_loop(fs_impl, inum, dev, type, sb, bp, dip, next(...)); } @@ -39,7 +39,7 @@ } -__code allocinode_loop(struct fs_impl* fs_impl, uint inum, uint dev, short type, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...)){ //:skip +__code allocinode_loop(struct fs_impl* fs_impl, uint inum, uint dev, short type, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(...)){ bp = bread(dev, IBLOCK(inum)); dip = (struct dinode*) bp->data + inum % IPB; if(dip->type = 0){ @@ -92,7 +92,7 @@ return ip; } -__code allocinode_noloop(struct fs_impl* fs_impl, uint inum, uint dev, short type, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(int ret, ...)){ //:skip +__code allocinode_noloop(struct fs_impl* fs_impl, uint inum, uint dev, short type, struct superblock* sb, struct buf* bp, struct dinode* dip, __code next(int ret, ...)){ memset(dip, 0, sizeof(*dip)); dip->type = type; @@ -104,7 +104,7 @@ } -__code lockinode1(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, struct dinode* dip, __code next(...)){ //:skip +__code lockinode1(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, struct dinode* dip, __code next(...)){ if (ip == 0 || ip->ref < 1) { char* msg = "ilock"; @@ -119,7 +119,7 @@ } -__code lockinode2(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, struct dinode* dip, __code next(...)){ //:skip +__code lockinode2(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, struct dinode* dip, __code next(...)){ ip->flags |= I_BUSY; release(&icache.lock); @@ -335,7 +335,7 @@ } -__code readi_loop(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, uint tot, uint m, char* dst, uint off, uint n, __code next(...)){ //:skip +__code readi_loop(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, uint tot, uint m, char* dst, uint off, uint n, __code next(...)){ bp = bread(ip->dev, bmap(ip, off / BSIZE)); m = min(n - tot, BSIZE - off%BSIZE); memmove(dst, bp->data + off % BSIZE, m); @@ -368,7 +368,7 @@ goto writei_noloop(fs_impl, next(...)); } -__code writei_loop(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, uint tot, uint m, char* src, uint off, uint n, __code next(...)){ //:skip +__code writei_loop(struct fs_impl* fs_impl, struct inode* ip, struct buf* bp, uint tot, uint m, char* src, uint off, uint n, __code next(...)){ bp = bread(ip->dev, bmap(ip, off / BSIZE)); m = min(n - tot, BSIZE - off%BSIZE); memmove(bp->data + off % BSIZE, src, m); @@ -389,7 +389,7 @@ goto next(ret, ...); } typedef struct dirent dirent; -__code dirlookup_loopcheck(struct fs_impl* fs_impl, struct inode* dp, char* name, uint off, uint* poff, dirent* de, __code next(...)){ //:skip +__code dirlookup_loopcheck(struct fs_impl* fs_impl, struct inode* dp, char* name, uint off, uint* poff, dirent* de, __code next(...)){ if(off < dp->size){ goto dirlookup_loop(fs_impl, dp, name, off, inum, poff, de, next(...)); } @@ -435,14 +435,14 @@ goto next(ret, ...); } -__code dirlink_loopcheck(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, __code next(...)){ //:skip +__code dirlink_loopcheck(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, __code next(...)){ if(off < dp->size){ goto dirlink_loop(fs_impl, de, dp, off, inum, next(...)); } goto dirlink_noloop(fs_impl, de, dp, off, inum, name, next(...)); } -__code dirlink_loop(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, uint inum, __code next(...)){ //:skip +__code dirlink_loop(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, uint inum, __code next(...)){ if (readi(dp, (char*) &de, off, sizeof(de)) != sizeof(de)) { char* msg = "dirlink read"; struct Err* err = createKernelError(&proc->cbc_context); @@ -457,7 +457,7 @@ goto dirlink_loopcheck(fs_impl, de, dp, off + sizeof(de), next(...)); } -__code dirlink_noloop(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, uint inum, char* name, __code next(int ret, ...)){ //:skip +__code dirlink_noloop(struct fs_impl* fs_impl, struct dirent* de, struct inode* dp, uint off, uint inum, char* name, __code next(int ret, ...)){ strncpy(de->name, name, DIRSIZ); de->inum = inum;
--- a/src/impl/vm_impl.cbc Sat Feb 15 21:35:56 2020 +0900 +++ b/src/impl/vm_impl.cbc Sun Feb 16 18:30:06 2020 +0900 @@ -143,7 +143,7 @@ } typedef struct proc proc; -__code switchuvmvm_impl(struct vm_impl* vm , proc* p, __code next(...)) { //:skip +__code switchuvmvm_impl(struct vm_impl* vm , proc* p, __code next(...)) { Gearef(cbc_context, vm_impl)->p = p; Gearef(cbc_context, vm_impl)->next = next; goto switchuvm_check_pgdirvm_impl(vm, p, next(...));
--- a/src/impl/vm_impl_private.cbc Sat Feb 15 21:35:56 2020 +0900 +++ b/src/impl/vm_impl_private.cbc Sun Feb 16 18:30:06 2020 +0900 @@ -7,7 +7,7 @@ #interface "Err.h" /* -vm_impl* createvm_impl2(); //:skip +vm_impl* createvm_impl2(); */ __code loaduvm_ptesize_checkvm_impl(struct vm_impl* vm_impl,char* addr, __code next(int ret, ...)) { @@ -367,7 +367,7 @@ } typedef struct proc proc_struct; -__code switchuvm_check_pgdirvm_impl(struct vm_impl* vm_impl, proc_struct* p, __code next(...)) { //:skip +__code switchuvm_check_pgdirvm_impl(struct vm_impl* vm_impl, proc_struct* p, __code next(...)) { uint val; pushcli();