base: Module lib asm

This patch rewrites the module library in SPU assembly for a code size
reduction of 988 bytes.

Signed-off-by: Yuji Mano <yuji.mano@am.sony.com>
Acked-by: Kazunori Asayama <asayama@sm.sony.co.jp>

4 files changed, 339 insertions, 245 deletions

diff --git a/base/src/mpu/lib/Makefile.am b/base/src/mpu/lib/Makefile.am
index ad0889d..6495280 100644
--- a/base/src/mpu/lib/Makefile.am
+++ b/base/src/mpu/lib/Makefile.am
@@ -93,5 +93,4 @@ lib_LTLIBRARIES = libmars_base.la
 
 libmars_base_la_SOURCES = \
 	$(srcdir)/../../../src/common/*.h \
-	entry.S \
-	module.c
+	module.S
diff --git a/base/src/mpu/lib/entry.S b/base/src/mpu/lib/entry.S
deleted file mode 100644
index 7888c4a..0000000
--- a/base/src/mpu/lib/entry.S
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2009 Sony Corporation of America
- *
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this Library and associated documentation files (the
- * "Library"), to deal in the Library without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Library, and to
- * permit persons to whom the Library is furnished to do so, subject to
- * the following conditions:
- *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Library.
- *
- *  If you modify the Library, you may copy and distribute your modified
- *  version of the Library in object code or as an executable provided
- *  that you also do one of the following:
- *
- *   Accompany the modified version of the Library with the complete
- *   corresponding machine-readable source code for the modified version
- *   of the Library; or,
- *
- *   Accompany the modified version of the Library with a written offer
- *   for a complete machine-readable copy of the corresponding source
- *   code of the modified version of the Library.
- *
- *
- * THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
- */
-
-.text
-
-/* void mars_module_entry(const struct mars_kernel_syscalls *syscalls) */
-.global	mars_module_entry
-.type	mars_module_entry, @function
-mars_module_entry:
-	ila	$SP, __stack		/* switch to module stack */
-	il	$LR, 0			/* set module link register to NULL */
-	stqd	$LR, 0($SP)		/* initialize back chain to NULL */
-	stqd	$SP, -32($SP)		/* initialize stack frame */
-	ai	$SP, $SP, -32		/* push stack frame */
-	brsl	$LR, __module_entry	/* call module entry body */
-.size	mars_module_entry, .-mars_module_entry
diff --git a/base/src/mpu/lib/module.S b/base/src/mpu/lib/module.S
new file mode 100644
index 0000000..94c23fd
--- /dev/null
+++ b/base/src/mpu/lib/module.S
@@ -0,0 +1,338 @@
+/*
+ * Copyright 2009 Sony Corporation of America
+ *
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this Library and associated documentation files (the
+ * "Library"), to deal in the Library without restriction, including
+ * without limitation the rights to use, copy, modify, merge, publish,
+ * distribute, sublicense, and/or sell copies of the Library, and to
+ * permit persons to whom the Library is furnished to do so, subject to
+ * the following conditions:
+ *
+ *  The above copyright notice and this permission notice shall be
+ *  included in all copies or substantial portions of the Library.
+ *
+ *  If you modify the Library, you may copy and distribute your modified
+ *  version of the Library in object code or as an executable provided
+ *  that you also do one of the following:
+ *
+ *   Accompany the modified version of the Library with the complete
+ *   corresponding machine-readable source code for the modified version
+ *   of the Library; or,
+ *
+ *   Accompany the modified version of the Library with a written offer
+ *   for a complete machine-readable copy of the corresponding source
+ *   code of the modified version of the Library.
+ *
+ *
+ * THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+ * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+ * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+ * LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
+ */
+
+/* NOTE: Order of defines must be the same as the member order of
+         struct mars_kernel_syscalls declaration in kernel_internal_types.h */
+#define get_ticks			0
+#define get_mars_context_ea		4
+#define get_kernel_id			8
+#define get_workload_id			12
+#define get_workload			16
+#define get_workload_by_id		20
+#define workload_exit			24
+#define workload_query			28
+#define workload_wait_set		32
+#define workload_wait_reset		36
+#define workload_signal_set		40
+#define workload_signal_reset		44
+#define workload_schedule_begin		48
+#define workload_schedule_end		52
+#define workload_schedule_cancel	56
+#define host_signal_send		60
+#define host_callback_set		64
+#define host_callback_reset		68
+#define mutex_lock_get			72
+#define mutex_unlock_put		76
+#define dma_get				80
+#define dma_put				84
+#define dma_wait			88
+
+/* NOTE: Value of defines must equal defines in workload_internal_types.h */
+#define WORKLOAD_EXIT_STATE_READY	0x04 /* MARS_WORKLOAD_STATE_READY */
+#define WORKLOAD_EXIT_STATE_WAITING	0x05 /* MARS_WORKLOAD_STATE_WAITING */
+#define WORKLOAD_EXIT_STATE_FINISHED	0x07 /* MARS_WORKLOAD_STATE_FINISHED */
+
+
+.section .bss
+
+/* const struct mars_kernel_syscalls *kernel_syscalls */
+.align	4
+.globl	kernel_syscalls
+kernel_syscalls:
+.space	16
+
+
+.text
+
+/* void mars_module_entry(const struct mars_kernel_syscalls *syscalls) */
+.global	mars_module_entry
+.type	mars_module_entry, @function
+mars_module_entry:
+	ila	$SP, __stack			/* switch to module stack */
+	il	$LR, 0				/* set link register to NULL */
+	stqd	$LR, 0($SP)			/* init back chain to NULL */
+	stqd	$SP, -32($SP)			/* init stack frame */
+	ai	$SP, $SP, -32			/* push stack frame */
+
+	stqr	$3, kernel_syscalls		/* save kernel syscalls ptr */
+	brsl	$LR, _init			/* call _init() */
+	brsl	$LR, mars_module_main		/* call mars_module_main() */
+	br	mars_module_workload_finish	/* return to kernel */
+.size	mars_module_entry, .-mars_module_entry
+
+
+/* uint32_t mars_module_get_ticks(void) */
+.global	mars_module_get_ticks
+.type	mars_module_get_ticks, @function
+mars_module_get_ticks:
+	il	$2, get_ticks
+	br	call_kernel_syscall
+.size	mars_module_get_ticks, .-mars_module_get_ticks
+
+
+/* uint64_t mars_module_get_mars_context_ea(void) */
+.global	mars_module_get_mars_context_ea
+.type	mars_module_get_mars_context_ea, @function
+mars_module_get_mars_context_ea:
+	il	$2, get_mars_context_ea
+	br	call_kernel_syscall
+.size	mars_module_get_mars_context_ea, .-mars_module_get_mars_context_ea
+
+
+/* uint16_t mars_module_get_kernel_id(void) */
+.global	mars_module_get_kernel_id
+.type	mars_module_get_kernel_id, @function
+mars_module_get_kernel_id:
+	il	$2, get_kernel_id
+	br	call_kernel_syscall
+.size	mars_module_get_kernel_id, .-mars_module_get_kernel_id
+
+
+/* uint16_t mars_module_get_workload_id(void) */
+.global	mars_module_get_workload_id
+.type	mars_module_get_workload_id, @function
+mars_module_get_workload_id:
+	il	$2, get_workload_id
+	br	call_kernel_syscall
+.size	mars_module_get_workload_id, .-mars_module_get_workload_id
+
+
+/* struct mars_workload_context *mars_module_get_workload(void) */
+.global	mars_module_get_workload
+.type	mars_module_get_workload, @function
+mars_module_get_workload:
+	il	$2, get_workload
+	br	call_kernel_syscall
+.size	mars_module_get_workload, .-mars_module_get_workload
+
+
+/* struct mars_workload_context *mars_module_get_workload_by_id(uint16_t id) */
+.global	mars_module_get_workload_by_id
+.type	mars_module_get_workload_by_id, @function
+mars_module_get_workload_by_id:
+	il	$2, get_workload_by_id
+	br	call_kernel_syscall
+.size	mars_module_get_workload_by_id, .-mars_module_get_workload_by_id
+
+
+/* int mars_module_workload_query(uint16_t id, int query) */
+.global	mars_module_workload_query
+.type	mars_module_workload_query, @function
+mars_module_workload_query:
+	il	$2, workload_query
+	br	call_kernel_syscall
+.size	mars_module_workload_query, .-mars_module_workload_query
+
+
+/* int mars_module_workload_wait_set(uint16_t id) */
+.global	mars_module_workload_wait_set
+.type	mars_module_workload_wait_set, @function
+mars_module_workload_wait_set:
+	il	$2, workload_wait_set
+	br	call_kernel_syscall
+.size	mars_module_workload_wait_set, .-mars_module_workload_wait_set
+
+
+/* int mars_module_workload_wait_reset(void) */
+.global	mars_module_workload_wait_reset
+.type	mars_module_workload_wait_reset, @function
+mars_module_workload_wait_reset:
+	il	$2, workload_wait_reset
+	br	call_kernel_syscall
+.size	mars_module_workload_wait_reset, .-mars_module_workload_wait_reset
+
+
+/* int mars_module_workload_signal_set(uint16_t id) */
+.global	mars_module_workload_signal_set
+.type	mars_module_workload_signal_set, @function
+mars_module_workload_signal_set:
+	il	$2, workload_signal_set
+	br	call_kernel_syscall
+.size	mars_module_workload_signal_set, .-mars_module_workload_signal_set
+
+
+/* int mars_module_workload_signal_reset(void) */
+.global	mars_module_workload_signal_reset
+.type	mars_module_workload_signal_reset, @function
+mars_module_workload_signal_reset:
+	il	$2, workload_signal_reset
+	br	call_kernel_syscall
+.size	mars_module_workload_signal_reset, .-mars_module_workload_signal_reset
+
+
+/* int mars_module_workload_schedule_begin(uint16_t id,
+					   uint8_t priority,
+					   struct mars_workload_context **workload) */
+.global	mars_module_workload_schedule_begin
+.type	mars_module_workload_schedule_begin, @function
+mars_module_workload_schedule_begin:
+	il	$2, workload_schedule_begin
+	br	call_kernel_syscall
+.size	mars_module_workload_schedule_begin, .-mars_module_workload_schedule_begin
+
+
+/* int mars_module_workload_schedule_end(uint16_t id) */
+.global	mars_module_workload_schedule_end
+.type	mars_module_workload_schedule_end, @function
+mars_module_workload_schedule_end:
+	il	$2, workload_schedule_end
+	br	call_kernel_syscall
+.size	mars_module_workload_schedule_end, .-mars_module_workload_schedule_end
+
+
+/* int mars_module_workload_schedule_cancel(uint16_t id) */
+.global	mars_module_workload_schedule_cancel
+.type	mars_module_workload_schedule_cancel, @function
+mars_module_workload_schedule_cancel:
+	il	$2, workload_schedule_cancel
+	br	call_kernel_syscall
+.size	mars_module_workload_schedule_cancel, .-mars_module_workload_schedule_cancel
+
+
+/* void mars_module_workload_wait(void) */
+.global	mars_module_workload_wait
+.type	mars_module_workload_wait, @function
+mars_module_workload_wait:
+	il	$3, WORKLOAD_EXIT_STATE_WAITING
+	il	$2, workload_exit
+	br	call_kernel_syscall
+.size	mars_module_workload_wait, .-mars_module_workload_wait
+
+
+/* void mars_module_workload_yield(void) */
+.global	mars_module_workload_yield
+.type	mars_module_workload_yield, @function
+mars_module_workload_yield:
+	il	$3, WORKLOAD_EXIT_STATE_READY
+	il	$2, workload_exit
+	br	call_kernel_syscall
+.size	mars_module_workload_yield, .-mars_module_workload_yield
+
+
+/* void mars_module_workload_finish(void) */
+.global	mars_module_workload_finish
+.type	mars_module_workload_finish, @function
+mars_module_workload_finish:
+	il	$3, WORKLOAD_EXIT_STATE_FINISHED
+	il	$2, workload_exit
+	br	call_kernel_syscall
+.size	mars_module_workload_finish, .-mars_module_workload_finish
+
+
+/* int mars_module_host_signal_send(uint64_t watch_point_ea) */
+.global	mars_module_host_signal_send
+.type	mars_module_host_signal_send, @function
+mars_module_host_signal_send:
+	il	$2, host_signal_send
+	br	call_kernel_syscall
+.size	mars_module_host_signal_send, .-mars_module_host_signal_send
+
+
+/* int mars_module_host_callback_set(uint64_t callback_ea,
+				     const struct mars_callback_args *in) */
+.global	mars_module_host_callback_set
+.type	mars_module_host_callback_set, @function
+mars_module_host_callback_set:
+	il	$2, host_callback_set
+	br	call_kernel_syscall
+.size	mars_module_host_callback_set, .-mars_module_host_callback_set
+
+
+/* int mars_module_host_callback_reset(struct mars_callback_args *out) */
+.global	mars_module_host_callback_reset
+.type	mars_module_host_callback_reset, @function
+mars_module_host_callback_reset:
+	il	$2, host_callback_reset
+	br	call_kernel_syscall
+.size	mars_module_host_callback_reset, .-mars_module_host_callback_reset
+
+
+/* int mars_module_mutex_lock_get(uint64_t mutex_ea,
+				  struct mars_mutex *mutex) */
+.global	mars_module_mutex_lock_get
+.type	mars_module_mutex_lock_get, @function
+mars_module_mutex_lock_get:
+	il	$2, mutex_lock_get
+	br	call_kernel_syscall
+.size	mars_module_mutex_lock_get, .-mars_module_mutex_lock_get
+
+
+/* int mars_module_mutex_unlock_put(uint64_t mutex_ea,
+				    struct mars_mutex *mutex)  */
+.global	mars_module_mutex_unlock_put
+.type	mars_module_mutex_unlock_put, @function
+mars_module_mutex_unlock_put:
+	il	$2, mutex_unlock_put
+	br	call_kernel_syscall
+.size	mars_module_mutex_unlock_put, .-mars_module_mutex_unlock_put
+
+
+/* int mars_module_dma_get(void *ls, uint64_t ea, uint32_t size,
+			   uint32_t tag)  */
+.global	mars_module_dma_get
+.type	mars_module_dma_get, @function
+mars_module_dma_get:
+	il	$2, dma_get
+	br	call_kernel_syscall
+.size	mars_module_dma_get, .-mars_module_dma_get
+
+
+/* int mars_module_dma_put(const void *ls, uint64_t ea, uint32_t size,
+			   uint32_t tag) */
+.global	mars_module_dma_put
+.type	mars_module_dma_put, @function
+mars_module_dma_put:
+	il	$2, dma_put
+	br	call_kernel_syscall
+.size	mars_module_dma_put, .-mars_module_dma_get
+
+
+/* int mars_module_dma_wait(uint32_t tag) */
+.global	mars_module_dma_wait
+.type	mars_module_dma_wait, @function
+mars_module_dma_wait:
+	il	$2, dma_wait
+	br	call_kernel_syscall
+.size	mars_module_dma_wait, .-mars_module_dma_wait
+
+
+call_kernel_syscall:
+	lqr	$76, kernel_syscalls
+	lqx	$77, $76, $2
+	a	$78, $76, $2
+	rotqby  $79, $77, $78
+	bi	$79
diff --git a/base/src/mpu/lib/module.c b/base/src/mpu/lib/module.c
deleted file mode 100644
index 7018845..0000000
--- a/base/src/mpu/lib/module.c
+++ /dev/null
@@ -1,193 +0,0 @@
-/*
- * Copyright 2008 Sony Corporation of America
- *
- *
- * Permission is hereby granted, free of charge, to any person obtaining
- * a copy of this Library and associated documentation files (the
- * "Library"), to deal in the Library without restriction, including
- * without limitation the rights to use, copy, modify, merge, publish,
- * distribute, sublicense, and/or sell copies of the Library, and to
- * permit persons to whom the Library is furnished to do so, subject to
- * the following conditions:
- *
- *  The above copyright notice and this permission notice shall be
- *  included in all copies or substantial portions of the Library.
- *
- *  If you modify the Library, you may copy and distribute your modified
- *  version of the Library in object code or as an executable provided
- *  that you also do one of the following:
- *
- *   Accompany the modified version of the Library with the complete
- *   corresponding machine-readable source code for the modified version
- *   of the Library; or,
- *
- *   Accompany the modified version of the Library with a written offer
- *   for a complete machine-readable copy of the corresponding source
- *   code of the modified version of the Library.
- *
- *
- * THE LIBRARY IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- * LIBRARY OR THE USE OR OTHER DEALINGS IN THE LIBRARY.
- */
-
-#include "config.h"
-
-#include "mars/module.h"
-
-#include "kernel_internal_types.h"
-#include "workload_internal_types.h"
-
-/* global kernel syscalls pointer */
-static const struct mars_kernel_syscalls *kernel_syscalls;
-
-/* defined in crt */
-extern void _init(void);
-
-/* called by entry.S */
-void __module_entry(const struct mars_kernel_syscalls *syscalls);
-
-void __module_entry(const struct mars_kernel_syscalls *syscalls)
-{
-	kernel_syscalls = syscalls;
-
-	_init();
-
-	mars_module_main();
-
-	(*kernel_syscalls->workload_exit)(MARS_WORKLOAD_STATE_FINISHED);
-}
-
-uint32_t mars_module_get_ticks(void)
-{
-	return (*kernel_syscalls->get_ticks)();
-}
-
-uint64_t mars_module_get_mars_context_ea(void)
-{
-	return (*kernel_syscalls->get_mars_context_ea)();
-}
-
-uint16_t mars_module_get_kernel_id(void)
-{
-	return (*kernel_syscalls->get_kernel_id)();
-}
-
-uint16_t mars_module_get_workload_id(void)
-{
-	return (*kernel_syscalls->get_workload_id)();
-}
-
-struct mars_workload_context *mars_module_get_workload(void)
-{
-	return (*kernel_syscalls->get_workload)();
-}
-
-struct mars_workload_context *mars_module_get_workload_by_id(uint16_t id)
-{
-	return (*kernel_syscalls->get_workload_by_id)(id);
-}
-
-int mars_module_workload_query(uint16_t id, int query)
-{
-	return (*kernel_syscalls->workload_query)(id, query);
-}
-
-int mars_module_workload_wait_set(uint16_t id)
-{
-	return (*kernel_syscalls->workload_wait_set)(id);
-}
-
-int mars_module_workload_wait_reset(void)
-{
-	return (*kernel_syscalls->workload_wait_reset)();
-}
-
-int mars_module_workload_signal_set(uint16_t id)
-{
-	return (*kernel_syscalls->workload_signal_set)(id);
-}
-
-int mars_module_workload_signal_reset(void)
-{
-	return (*kernel_syscalls->workload_signal_reset)();
-}
-
-int mars_module_workload_schedule_begin(uint16_t id, uint8_t priority,
-					struct mars_workload_context **workload)
-{
-	return (*kernel_syscalls->workload_schedule_begin)(id,
-							   priority,
-							   workload);
-}
-
-int mars_module_workload_schedule_end(uint16_t id)
-{
-	return (*kernel_syscalls->workload_schedule_end)(id);
-}
-
-int mars_module_workload_schedule_cancel(uint16_t id)
-{
-	return (*kernel_syscalls->workload_schedule_cancel)(id);
-}
-
-void mars_module_workload_wait(void)
-{
-	(*kernel_syscalls->workload_exit)(MARS_WORKLOAD_STATE_WAITING);
-}
-
-void mars_module_workload_yield(void)
-{
-	(*kernel_syscalls->workload_exit)(MARS_WORKLOAD_STATE_READY);
-}
-
-void mars_module_workload_finish(void)
-{
-	(*kernel_syscalls->workload_exit)(MARS_WORKLOAD_STATE_FINISHED);
-}
-
-int mars_module_host_signal_send(uint64_t watch_point_ea)
-{
-	return (*kernel_syscalls->host_signal_send)(watch_point_ea);
-}
-
-int mars_module_host_callback_set(uint64_t callback_ea,
-				  const struct mars_callback_args *in)
-{
-	return (*kernel_syscalls->host_callback_set)(callback_ea, in);
-}
-
-int mars_module_host_callback_reset(struct mars_callback_args *out)
-{
-	return (*kernel_syscalls->host_callback_reset)(out);
-}
-
-int mars_module_mutex_lock_get(uint64_t mutex_ea, struct mars_mutex *mutex)
-{
-	return (*kernel_syscalls->mutex_lock_get)(mutex_ea, mutex);
-}
-
-int mars_module_mutex_unlock_put(uint64_t mutex_ea, struct mars_mutex *mutex)
-{
-	return (*kernel_syscalls->mutex_unlock_put)(mutex_ea, mutex);
-}
-
-int mars_module_dma_get(void *ls, uint64_t ea, uint32_t size, uint32_t tag)
-{
-	return (*kernel_syscalls->dma_get)(ls, ea, size, tag);
-}
-
-int mars_module_dma_put(const void *ls, uint64_t ea, uint32_t size,
-			uint32_t tag)
-{
-	return (*kernel_syscalls->dma_put)(ls, ea, size, tag);
-}
-
-int mars_module_dma_wait(uint32_t tag)
-{
-	return (*kernel_syscalls->dma_wait)(tag);
-}