diff --git a/libcpu/mips/pic32/stack.c b/libcpu/mips/pic32/cpuport.c
similarity index 86%
rename from libcpu/mips/pic32/stack.c
rename to libcpu/mips/pic32/cpuport.c
index f7510ce4ceb4d1d2b842c05a73ba751d2b4bebb0..180ea7a942cb14aec38b509a8c60411643cbaa72 100644
--- a/libcpu/mips/pic32/stack.c
+++ b/libcpu/mips/pic32/cpuport.c
@@ -1,7 +1,7 @@
 /*
- * File      : stack.c
+ * File      : cpuport.c
  * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006, RT-Thread Development Team
+ * COPYRIGHT (C) 2009 - 2011, RT-Thread Development Team
  *
  * The license and distribution terms for this file may be
  * found in the file LICENSE in this distribution or at
@@ -9,9 +9,9 @@
  *
  * Change Logs:
  * Date           Author       Notes
- * 2011-05-23     aozima       first implementation for PIC32.
+ * 20011-05-23    aozima       the first version for PIC32.
+ * 20011-09-05    aozima       merge all of C source code into cpuport.c.
  */
-
 #include <rtthread.h>
 
 /**
@@ -19,6 +19,10 @@
  */
 /*@{*/
 
+/* exception and interrupt handler table */
+rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
+rt_uint32_t rt_thread_switch_interrput_flag;
+
 rt_uint32_t __attribute__((nomips16)) _get_gp(void)
 {
     rt_uint32_t result;
@@ -88,5 +92,5 @@ rt_uint8_t *rt_hw_stack_init(void *tentry, void *parameter, rt_uint8_t *stack_ad
 	return (rt_uint8_t *)stk;
 }
 
-/*@}*/
 
+/*@}*/
diff --git a/libcpu/mips/pic32/interrupt.c b/libcpu/mips/pic32/interrupt.c
deleted file mode 100644
index 5e63295b6c4fb3f4c9ea534bc55798ba07977a6d..0000000000000000000000000000000000000000
--- a/libcpu/mips/pic32/interrupt.c
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * File      : interrupt.c
- * This file is part of RT-Thread RTOS
- * COPYRIGHT (C) 2006 - 2010, RT-Thread Development Team
- *
- * The license and distribution terms for this file may be
- * found in the file LICENSE in this distribution or at
- * http://www.rt-thread.org/license/LICENSE
- *
- * Change Logs:
- * Date           Author       Notes
- * 2011-05-23     aozima       first implementation for PIC32.
- */
-
-#include <rtthread.h>
-
-/**
- * @addtogroup PIC32
- */
-/*@{*/
-
-rt_uint32_t rt_interrupt_from_thread, rt_interrupt_to_thread;
-rt_uint32_t rt_thread_switch_interrput_flag;
-
-
-/*@}*/
-