[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[dotgnu-pnet-commits] libjit ./ChangeLog include/jit/jit-except.h jit...
|
From: |
Aleksey Demakov |
|
Subject: |
[dotgnu-pnet-commits] libjit ./ChangeLog include/jit/jit-except.h jit... |
|
Date: |
Fri, 23 Dec 2005 21:26:50 +0000 |
CVSROOT: /sources/dotgnu-pnet
Module name: libjit
Branch:
Changes by: Aleksey Demakov <address@hidden> 05/12/23 21:26:50
Modified files:
. : ChangeLog
include/jit : jit-except.h
jit : jit-except.c
dpas : dpas-parser.y
Log message:
implement array expressions
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/ChangeLog.diff?tr1=1.183&tr2=1.184&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/include/jit/jit-except.h.diff?tr1=1.3&tr2=1.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/jit/jit-except.c.diff?tr1=1.4&tr2=1.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/dotgnu-pnet/libjit/dpas/dpas-parser.y.diff?tr1=1.15&tr2=1.16&r1=text&r2=text
Patches:
Index: libjit/ChangeLog
diff -u libjit/ChangeLog:1.183 libjit/ChangeLog:1.184
--- libjit/ChangeLog:1.183 Thu Dec 22 08:24:28 2005
+++ libjit/ChangeLog Fri Dec 23 21:26:50 2005
@@ -1,3 +1,16 @@
+2005-12-24 Avinash Atreya <address@hidden>
+
+ * dpas/dpas-parser.y: implement array expressions (committed by Aleksey
+ Demakov, jit_insn_throw replaced with throw_builtin_exception)
+
+2005-12-24 Aleksey Demakov <address@hidden>
+
+ * include/jit/jit-except.h, jit/jit-except.c (jit_exception_builtin):
+ add JIT_RESULT_OUT_OF_BOUNDS builtin exception type code.
+
+ * dpas/dpas-parser.y (throw_builtin_exception): add static function
+ that makes jit_exception_builtin call.
+
2005-12-22 Aleksey Demakov <address@hidden>
* jit/jit-rules-x86.sel: implement JIT_OP_MEMSET and JIT_OP_MEMCPY
Index: libjit/dpas/dpas-parser.y
diff -u libjit/dpas/dpas-parser.y:1.15 libjit/dpas/dpas-parser.y:1.16
--- libjit/dpas/dpas-parser.y:1.15 Mon Jun 14 04:57:02 2004
+++ libjit/dpas/dpas-parser.y Fri Dec 23 21:26:50 2005
@@ -592,6 +592,35 @@
return rvalue;
}
+static int throw_builtin_exception(jit_function_t func, int exception_type)
+{
+ jit_type_t signature;
+ jit_type_t param_types[1];
+ jit_value_t param_values[1];
+
+ /* Call the "jit_exception_builtin" function to report the exception */
+ param_types[0] = jit_type_int;
+ signature = jit_type_create_signature
+ (jit_abi_cdecl, jit_type_void, param_types, 1, 1);
+ if(!signature)
+ {
+ return 0;
+ }
+
+ param_values[0] = jit_value_create_nint_constant(func, jit_type_int,
exception_type);
+ if(!param_values[0])
+ {
+ return 0;
+ }
+ jit_insn_call_native
+ (func, "jit_exception_builtin",
+ (void *)jit_exception_builtin, signature, param_values, 1,
+ JIT_CALL_NORETURN);
+ jit_type_free(signature);
+
+ return 1;
+}
+
/*
* Handle a numeric binary operator.
*/
@@ -2725,7 +2754,6 @@
jit_value_t array = 0;
jit_type_t array_type = 0;
jit_type_t elem_type = 0;
- jit_value_t *low_bounds = 0;
int rank = $3.len;
if(dpas_sem_is_lvalue($1) ||
dpas_sem_is_lvalue_ea($1))
{
@@ -2800,16 +2828,125 @@
}
else if(array)
{
- /* TODO */
- dpas_error("array expressions are not
fully implemented");
- dpas_sem_set_error($$);
+ jit_nint i = 0;
+ jit_function_t func =
dpas_current_function();
+ jit_value_t total_offset = 0;
+ jit_value_t lvalue_ea = 0;
+ jit_value_t index = 0;
+ jit_value_t lower_bound = 0;
+ jit_value_t upper_bound = 0;
+ jit_value_t difference = 0;
+ jit_value_t factor = 0;
+ jit_value_t offset = 0;
+ jit_value_t temp1 = 0;
+ jit_value_t temp2 = 0;
+ jit_value_t zero = 0;
+ jit_label_t out_of_bounds =
jit_label_undefined;
+ jit_label_t all_is_well =
jit_label_undefined;
+ jit_nuint range_size = 1;
+ dpas_array *info = 0;
+ jit_type_t *bounds = 0;
+
+ /* get the bounds from the tagged type
that was created during array creation */
+ /* may not be available if the array is
accessed via a pointer */
+ info =
jit_type_get_tagged_data(array_type);
+ if (info)
+ {
+ bounds = info->bounds;
+ }
+
+ /* create a constant jit_value_t that
holds 0 */
+ /* needed for comparision and
initialization */
+ zero =
jit_value_create_nint_constant(func,jit_type_uint,0);
+
+ /* initialize total_offset with zero */
+ total_offset =
jit_value_create(func,jit_type_uint);
+ jit_insn_store(func,total_offset,zero);
+
+ for ( i = 0 ; i < rank ; i++ )
+ {
+ /* get the value of the index
from the expression list */
+ index =
dpas_sem_get_value($3.exprs[i]);
+
+ /* get values for upper and
lower bounds */
+ if ( bounds )
+ {
+ /* bounds can be either
subrange or tagged */
+ if (
jit_type_get_tagged_kind(bounds[i]) == DPAS_TAG_SUBRANGE )
+ {
+ upper_bound =
jit_value_create_nint_constant(func,jit_type_int,
+
((dpas_subrange *)jit_type_get_tagged_data(bounds[i]))->last.un.int_value);
+ lower_bound =
jit_value_create_nint_constant(func,jit_type_int,
+
((dpas_subrange *)jit_type_get_tagged_data(bounds[i]))->first.un.int_value);
+ }
+ else if (
jit_type_get_tagged_kind(bounds[i]) == DPAS_TAG_ENUM )
+ {
+ upper_bound =
jit_value_create_nint_constant(func,jit_type_int,
+
((dpas_enum *)jit_type_get_tagged_data(bounds[i]))->num_elems-1);
+ lower_bound =
jit_value_create_nint_constant(func,jit_type_int,0);
+ }
+
+ /* check the upper
bound first */
+ temp1 =
jit_insn_le(func,index,upper_bound);
+ /* jump if not less
than or equal to out_of_bounds */
+
jit_insn_branch_if_not(func,temp1,&out_of_bounds);
+ /* fall through if it
is less than or equal */
+
+ /* compute difference =
index - lower_bound and check greater than 0
+ so that we can
re-use it */
+ difference =
jit_insn_sub(func,index,lower_bound);
+
+ temp2 =
jit_insn_ge(func,difference,zero);
+ /* jump if not greater
than or equal to out_of_bounds */
+
jit_insn_branch_if_not(func,temp2,&out_of_bounds);
+ /* fall through if
greater than or equal */
+
+ /* create a
constant_value for the factor(range_size) */
+ factor =
jit_value_create_nint_constant(func,jit_type_uint,range_size);
+
+ /* offset = difference
* factor */
+ offset =
jit_insn_mul(func,difference,factor);
+
+ /* total_offset +=
offset */
+ total_offset =
jit_insn_add(func,total_offset,offset);
+
+ /*compute the range
size for the next dimension */
+ range_size *=
(jit_value_get_nint_constant(upper_bound) -
+
(jit_value_get_nint_constant(lower_bound) -1));
+ }
+ else
+ {
+ /* no bounds are
available, so it must be a pointer access */
+
jit_insn_store(func,total_offset,index);
+ }
+ }
+
+ if ( bounds )
+ {
+ /* if anything went wrong in
the loop, we would be in out_of_bounds.
+ so jump to all_is_well
*/
+
jit_insn_branch(func,&all_is_well);
+
+ /* if we are here,
out_of_bounds, throw an exception */
+
jit_insn_label(func,&out_of_bounds);
+
+ throw_builtin_exception(func,
JIT_RESULT_OUT_OF_BOUNDS);
+
+ /* if we we are here,
all_is_well */
+
jit_insn_label(func,&all_is_well);
+ }
+
+ /* compute effective address and set
lvalue_ea*/
+ lvalue_ea =
jit_insn_load_elem_address(func,array,total_offset,elem_type);
+
dpas_sem_set_lvalue_ea($$,elem_type,lvalue_ea);
+
+ /* clean-up : we aren't allocating
anything here */
}
else
{
dpas_error("invalid l-value supplied to
array expression");
dpas_sem_set_error($$);
}
- jit_free(low_bounds);
expression_list_free($3.exprs, $3.len);
}
| Variable '.' Identifier {
Index: libjit/include/jit/jit-except.h
diff -u libjit/include/jit/jit-except.h:1.3 libjit/include/jit/jit-except.h:1.4
--- libjit/include/jit/jit-except.h:1.3 Wed Oct 6 05:43:15 2004
+++ libjit/include/jit/jit-except.h Fri Dec 23 21:26:50 2005
@@ -39,6 +39,7 @@
#define JIT_RESULT_NULL_REFERENCE -5
#define JIT_RESULT_NULL_FUNCTION -6
#define JIT_RESULT_CALLED_NESTED -7
+#define JIT_RESULT_OUT_OF_BOUNDS -8
/*
* Exception handling function for builtin exceptions.
Index: libjit/jit/jit-except.c
diff -u libjit/jit/jit-except.c:1.4 libjit/jit/jit-except.c:1.5
--- libjit/jit/jit-except.c:1.4 Sun Dec 18 17:44:54 2005
+++ libjit/jit/jit-except.c Fri Dec 23 21:26:50 2005
@@ -200,7 +200,7 @@
{
jit_exception_func handler;
void *object;
- static const char * const messages[9] = {
+ static const char * const messages[10] = {
"Success",
"Overflow during checked arithmetic operation",
"Arithmetic exception (dividing the minimum integer by -1)",
@@ -209,7 +209,8 @@
"Out of memory",
"Null pointer dereferenced",
"Null function pointer called",
- "Nested function called from non-nested context"
+ "Nested function called from non-nested context",
+ "Array index out of bounds"
};
#define num_messages (sizeof(messages) / sizeof(const char *))
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [dotgnu-pnet-commits] libjit ./ChangeLog include/jit/jit-except.h jit...,
Aleksey Demakov <=