diff -Ncwr utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_calls.c utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_calls.c
*** utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_calls.c	2007-03-12 20:25:55.000000000 +0900
--- utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_calls.c	2007-08-29 22:05:42.000000000 +0900
***************
*** 13,19 ****
   */
  
  /*
!  *	cpu_calls.c (H8S2212)
   *	CPU-Dependent System Call
   */
  
--- 13,19 ----
   */
  
  /*
!  *	cpu_calls.c (h8300hn)
   *	CPU-Dependent System Call
   */
  
***************
*** 152,159 ****
  	}
  
  	if ( eit != NULL ) {
! 		ssp->sccr_spc = (UW)eit->pc;
! 		ssp->sccr_spc &= 0x00ffffffUL; /* 24bit */
  		ssp->sccr_spc |= (UW)eit->ccr << 24;
  	}
  
--- 152,158 ----
  	}
  
  	if ( eit != NULL ) {
! 		ssp->sccr_spc = (UH)eit->pc;
  		ssp->sccr_spc |= (UW)eit->ccr << 24;
  	}
  
***************
*** 208,214 ****
  	}
  
  	if ( eit != NULL ) {
! 		eit->pc = (VP)(ssp->sccr_spc & 0x00ffffffUL);
  		eit->ccr = (VB)(ssp->sccr_spc >> 24);
  	}
  
--- 207,213 ----
  	}
  
  	if ( eit != NULL ) {
! 		eit->pc = (VP)((UH)ssp->sccr_spc);
  		eit->ccr = (VB)(ssp->sccr_spc >> 24);
  	}
  
diff -Ncwr utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_task.h utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_task.h
*** utkernel_source.prev/kernel/sysdepend/cpu/h8s2212/cpu_task.h	2007-03-12 20:25:55.000000000 +0900
--- utkernel_source.curr/kernel/sysdepend/cpu/h8s2212/cpu_task.h	2007-08-29 22:02:54.000000000 +0900
***************
*** 13,19 ****
   */
  
  /*
!  *	cpu_task.h (H8S2212)
   *	CPU-Dependent Task Start Processing
   */
  
--- 13,19 ----
   */
  
  /*
!  *	cpu_task.h (h8300hn)
   *	CPU-Dependent Task Start Processing
   */
  
***************
*** 57,63 ****
  
  	/* CPU context initialization */
  	/* Initial SR */ /* Task startup address */
! 	ssp->sccr_spc = (ccr << 24) | ((UW)tcb->task & 0x00ffffffUL);
  	tcb->tskctxb.ssp = ssp;			/* System stack */
  }
  
--- 57,63 ----
  
  	/* CPU context initialization */
  	/* Initial SR */ /* Task startup address */
! 	ssp->sccr_spc = (ccr << 24) | ((UH)tcb->task);
  	tcb->tskctxb.ssp = ssp;			/* System stack */
  }
  
***************
*** 70,76 ****
  	SStackFrame	*ssp = tcb->tskctxb.ssp;
  
  	ssp->er[6] = stacd;				/* er0 */
! 	ssp->er[5] = (VW)tcb->exinf;	/* er1 */
  }
  
  /*
--- 70,76 ----
  	SStackFrame	*ssp = tcb->tskctxb.ssp;
  
  	ssp->er[6] = stacd;				/* er0 */
! 	ssp->er[5] = (VH)tcb->exinf;	/* er1 */
  }
  
  /*
diff -Ncwr utkernel_source.prev/kernel/sysinit/src/sysstartup.c utkernel_source.curr/kernel/sysinit/src/sysstartup.c
*** utkernel_source.prev/kernel/sysinit/src/sysstartup.c	2007-03-12 20:25:57.000000000 +0900
--- utkernel_source.curr/kernel/sysinit/src/sysstartup.c	2007-08-29 22:00:27.000000000 +0900
***************
*** 19,24 ****
--- 19,25 ----
  
  #include "sysinit.h"
  #include "kernel.h"
+ #include "sysmgr.h"
  
  /*
   * Manager/Driver
diff -Ncwr utkernel_source.prev/kernel/tkernel/src/memory.c utkernel_source.curr/kernel/tkernel/src/memory.c
*** utkernel_source.prev/kernel/tkernel/src/memory.c	2007-03-12 20:25:59.000000000 +0900
--- utkernel_source.curr/kernel/tkernel/src/memory.c	2007-08-29 21:58:38.000000000 +0900
***************
*** 80,86 ****
  EXPORT void knl_appendFreeArea( IMACB *imacb, QUEUE *aq )
  {
  	QUEUE	*fq;
! 	W	size = AreaSize(aq);
  
  	/* Registration position search */
  	/*  Search the free area whose size is equal to 'blksz',
--- 80,86 ----
  EXPORT void knl_appendFreeArea( IMACB *imacb, QUEUE *aq )
  {
  	QUEUE	*fq;
! 	UH	size = AreaSize(aq);
  
  	/* Registration position search */
  	/*  Search the free area whose size is equal to 'blksz',
***************
*** 293,308 ****
  
  	/* Acquire system configuration definition information */
  	memend = CFN_REALMEMEND;
! 	if ( (UW)memend > (UW)knl_lowmem_limit ) {
  		memend = knl_lowmem_limit;
  	}
  
  	/* Align top with 8 byte unit alignment */
! 	knl_lowmem_top = (VP)(((UW)knl_lowmem_top + 7) & ~0x00000007UL);
  	knl_imacb = (IMACB*)knl_lowmem_top;
! 	knl_lowmem_top = (VP)((UW)knl_lowmem_top + sizeof(IMACB));
  	top = (QUEUE*)knl_lowmem_top;
! 	knl_imacb->memsz = (W)((UW)memend - (UW)knl_lowmem_top - sizeof(QUEUE)*2);
  
  	knl_lowmem_top = memend;  /* Update memory free space */
  
--- 293,308 ----
  
  	/* Acquire system configuration definition information */
  	memend = CFN_REALMEMEND;
! 	if ( (UH)memend > (UH)knl_lowmem_limit ) {
  		memend = knl_lowmem_limit;
  	}
  
  	/* Align top with 8 byte unit alignment */
! 	knl_lowmem_top = (VP)(((UH)knl_lowmem_top + 7) & ~0x0007);
  	knl_imacb = (IMACB*)knl_lowmem_top;
! 	knl_lowmem_top = (VP)((UH)knl_lowmem_top + sizeof(IMACB));
  	top = (QUEUE*)knl_lowmem_top;
! 	knl_imacb->memsz = (W)((UH)memend - (UH)knl_lowmem_top - sizeof(QUEUE)*2);
  
  	knl_lowmem_top = memend;  /* Update memory free space */
  
diff -Ncwr utkernel_source.prev/kernel/tkernel/src/memory.h utkernel_source.curr/kernel/tkernel/src/memory.h
*** utkernel_source.prev/kernel/tkernel/src/memory.h	2007-03-12 20:25:59.000000000 +0900
--- utkernel_source.curr/kernel/tkernel/src/memory.h	2007-08-29 21:57:12.000000000 +0900
***************
*** 66,85 ****
  /*
   * Flag that uses the lower bits of AreaQue's 'prev'.
   */
! #define AREA_USE	0x00000001UL	/* In-use */
! #define AREA_MASK	0x00000001UL
  
! #define setAreaFlag(q, f)   ( (q)->prev = (QUEUE*)((UW)(q)->prev |  (UW)(f)) )
! #define clrAreaFlag(q, f)   ( (q)->prev = (QUEUE*)((UW)(q)->prev & ~(UW)(f)) )
! #define chkAreaFlag(q, f)   ( ((UW)(q)->prev & (UW)(f)) != 0 )
  
! #define Mask(x)		( (QUEUE*)((UW)(x) & ~AREA_MASK) )
! #define Assign(x, y)	( (x) = (QUEUE*)(((UW)(x) & AREA_MASK) | (UW)(y)) )
  /*
   * Area size
   */
  #define AreaSize(aq)	( (VB*)(aq)->next - (VB*)((aq) + 1) )
! #define FreeSize(fq)	( (W)((fq) + 1)->prev )
  
  
  IMPORT QUEUE* knl_searchFreeArea( IMACB *imacb, W blksz );
--- 66,85 ----
  /*
   * Flag that uses the lower bits of AreaQue's 'prev'.
   */
! #define AREA_USE	0x0001	/* In-use */
! #define AREA_MASK	0x0001
  
! #define setAreaFlag(q, f)   ( (q)->prev = (QUEUE*)((UH)(q)->prev |  (UH)(f)) )
! #define clrAreaFlag(q, f)   ( (q)->prev = (QUEUE*)((UH)(q)->prev & ~(UH)(f)) )
! #define chkAreaFlag(q, f)   ( ((UH)(q)->prev & (UH)(f)) != 0 )
  
! #define Mask(x)		( (QUEUE*)((UH)(x) & ~AREA_MASK) )
! #define Assign(x, y)	( (x) = (QUEUE*)(((UH)(x) & AREA_MASK) | (UH)(y)) )
  /*
   * Area size
   */
  #define AreaSize(aq)	( (VB*)(aq)->next - (VB*)((aq) + 1) )
! #define FreeSize(fq)	( (UH)((fq) + 1)->prev )
  
  
  IMPORT QUEUE* knl_searchFreeArea( IMACB *imacb, W blksz );
diff -Ncwr utkernel_source.prev/kernel/tkernel/src/mempool.c utkernel_source.curr/kernel/tkernel/src/mempool.c
*** utkernel_source.prev/kernel/tkernel/src/mempool.c	2007-03-12 20:25:59.000000000 +0900
--- utkernel_source.curr/kernel/tkernel/src/mempool.c	2007-08-29 21:53:47.000000000 +0900
***************
*** 70,76 ****
  {
  	IMACB	*imacb = (IMACB*)&(mplcb->mplsz);
  	QUEUE	*fq, *top, *end;
! 	W	size;
  
  	if ( aq == &(mplcb->areaque) ) {
  		top = (QUEUE*)mplcb->mempool;
--- 70,76 ----
  {
  	IMACB	*imacb = (IMACB*)&(mplcb->mplsz);
  	QUEUE	*fq, *top, *end;
! 	UH	size;
  
  	if ( aq == &(mplcb->areaque) ) {
  		top = (QUEUE*)mplcb->mempool;
***************
*** 84,90 ****
  		end = aq->next;
  	}
  
! 	size = (W)((VB*)end - (VB*)top);
  
  	/* Registration position search */
  	/*  Search the free area whose size is equal to 'blksz',
--- 84,90 ----
  		end = aq->next;
  	}
  
! 	size = (UH)((VB*)end - (VB*)top);
  
  	/* Registration position search */
  	/*  Search the free area whose size is equal to 'blksz',
diff -Ncwr utkernel_source.prev/lib/libstr/src/string.c utkernel_source.curr/lib/libstr/src/string.c
*** utkernel_source.prev/lib/libstr/src/string.c	2007-03-12 20:26:03.000000000 +0900
--- utkernel_source.curr/lib/libstr/src/string.c	2007-08-29 21:52:57.000000000 +0900
***************
*** 54,60 ****
  		return s;
  	}
  
! 	while ((long)cp % 4) {
  		--n;
  		*cp++ = cval;
  	}
--- 54,60 ----
  		return s;
  	}
  
! 	while ((short)cp % 4) {
  		--n;
  		*cp++ = cval;
  	}