Subversion Repositories HelenOS-historic

Compare Revisions

Ignore whitespace Rev 197 → Rev 198

/SPARTAN/trunk/include/memstr.h
32,7 → 32,7
#include <typedefs.h>
#include <arch/types.h>
 
extern char * memcopy(void * dst, const void *src, size_t cnt);
extern char *memcopy(void * dst, const void *src, size_t cnt);
 
extern void memsetw(__address dst, size_t cnt, __u16 x);
extern void memsetb(__address dst, size_t cnt, __u8 x);
42,7 → 42,7
/*
* Architecture independent variants.
*/
extern char * _memcopy(void *dst, const void *src, size_t cnt);
extern char *_memcopy(void *dst, const void *src, size_t cnt);
extern void _memsetb(__address dst, size_t cnt, __u8 x);
 
#endif
/SPARTAN/trunk/src/Makefile.config
1,4 → 1,4
ARCH=ia32
#ARCH=ia32
#ARCH=mips
#ARCH=ia64
#ARCH=ppc
34,4 → 34,4
#TEST_DIR=synch/semaphore2/
#TEST_DIR=fpu/fpu1
#TEST_DIR=print/print1
TEST_DIR=thread/thread1
#TEST_DIR=thread/thread1
/SPARTAN/trunk/src/main/kinit.c
131,7 → 131,7
a = vm_area_create(m, VMA_TEXT, 1, UTEXT_ADDRESS);
if (!a) panic("vm_area_create: vm_text");
vm_area_map(a, m);
memcopy((__address) utext, PA2KA(a->mapping[0]), utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
memcopy(PA2KA(a->mapping[0]), (__address) utext, utext_size < PAGE_SIZE ? utext_size : PAGE_SIZE);
 
/*
* Create the data vm_area.
/SPARTAN/trunk/src/proc/scheduler.c
361,9 → 361,8
}
THREAD = NULL;
}
printf("*0*");
 
THREAD = find_best_thread();
printf("*1*");
spinlock_lock(&THREAD->lock);
priority = THREAD->pri;
/SPARTAN/trunk/src/lib/memstr.c
41,9 → 41,7
* @param cnt Number of bytes to copy.
*
*/
 
char * _memcopy(void * dst,const void *src, size_t cnt);
char * _memcopy(void * dst,const void *src, size_t cnt)
char *_memcopy(void * dst, const void *src, size_t cnt)
{
int i;
/SPARTAN/trunk/src/mm/vm.c
66,8 → 66,6
src_ptl0 = (pte_t *) PA2KA((__address) GET_PTL0_ADDRESS());
dst_ptl0 = (pte_t *) frame_alloc(FRAME_KA | FRAME_PANIC);
// memsetb((__address) dst_ptl0, PAGE_SIZE, 0);
// memcopy((__address) &src_ptl0[KAS_START_INDEX], (__address) &dst_ptl0[KAS_START_INDEX], KAS_INDICES*sizeof(pte_t));
memcopy((void *)PA2KA((__address) dst_ptl0), (void *)GET_PTL0_ADDRESS() , PAGE_SIZE);
m->ptl0 = (pte_t *) KA2PA((__address) dst_ptl0);
}
/SPARTAN/trunk/arch/ia32/src/asm.S
258,8 → 258,8
## Copy memory
#
# Copy a given number of bytes (3rd argument)
# from the memory location defined by 1st argument
# to the memory location defined by 2nd argument.
# from the memory location defined by 2nd argument
# to the memory location defined by 1st argument.
# The memory areas cannot overlap.
#
SRC=12
/SPARTAN/trunk/arch/ia32/src/smp/mps.c
312,7 → 312,7
{
#ifdef MPSCT_VERBOSE
char buf[7];
memcopy((__address) bus->bus_type, (__address) buf, 6);
memcopy((void *) buf, (void *) bus->bus_type, 6);
buf[6] = 0;
printf("bus%d: %s\n", bus->bus_id, buf);
#endif
/SPARTAN/trunk/arch/ia32/src/drivers/ega.c
73,7 → 73,7
if (ega_cursor < SCREEN)
return;
 
memcopy((void *)PA2KA(VIDEORAM),(void *)PA2KA(VIDEORAM) + ROW*2, (SCREEN - ROW)*2); //swaped
memcopy((void *)PA2KA(VIDEORAM),(void *)(PA2KA(VIDEORAM) + ROW*2), (SCREEN - ROW)*2); //swaped
memsetw(PA2KA(VIDEORAM) + (SCREEN - ROW)*2, ROW, 0x0720);
ega_cursor = ega_cursor - ROW;
}