Skip to content
GitLab
Commit 3637690e authored by Grzegorz Goral's avatar Grzegorz Goral
Browse files

Made ICM_UINT for vars which will only be unsigned, and updated to fit 

Keeping the rest of variables using VARINT/NT/ANY as ICM_INT as
they are related to shapes and array allocation - will be changed later
parent 64bf7f9c
develop 2366-virtual-stack-trace 2392-class-effect-bug 2424-typefix-bug Issue2418 alwyn-fold-traversal buildsystem_cuda_arch cleanup-wlblock distmem-minimal distmem-mt improved-WLF int2long integer-overflow memory_leak mt-beehive-sleeping-bees mt-schedule-refactor new_fun_types_charl one-bit-booleans potentially_faster_aplmod sanitize tp-always-generate-impl tp-use-primitives ub_and_leak v2.0.0-Tintigny
1 merge request!69Third wconversion changes
Hide whitespace changes
Inline Side-by-side
Showing
with 258 additions and 239 deletions
+258 -239
src/libsac2c/codegen/icm.data
+ 58
- 58
View file @ 3637690e
......@@ -11,7 +11,7 @@
ICM_DEF( ND_FUN_DECL, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_FUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -20,7 +20,7 @@ ICM_END( ND_FUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( ND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -29,7 +29,7 @@ ICM_END( ND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS, (name, rettype_NT, vararg_cnt, v
ICM_DEF( ND_FUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_FUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -38,7 +38,7 @@ ICM_END( ND_FUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( ND_FUN_DEF_END, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_FUN_DEF_END, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -47,7 +47,7 @@ ICM_END( ND_FUN_DEF_END, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MUTC_THREADFUN_DECL, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_THREADFUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -56,7 +56,7 @@ ICM_END( MUTC_THREADFUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MUTC_SPAWNFUN_DECL, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_SPAWNFUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -65,7 +65,7 @@ ICM_END( MUTC_SPAWNFUN_DECL, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MUTC_THREADFUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_THREADFUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -74,7 +74,7 @@ ICM_END( MUTC_THREADFUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MUTC_SPAWNFUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_SPAWNFUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -83,7 +83,7 @@ ICM_END( MUTC_SPAWNFUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( WE_FUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( WE_FUN_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -97,14 +97,14 @@ ICM_END( WE_MODFUN_INFO, (name, modname))
#if defined(WE_SHAPE_ENCODE) || defined(ICM_ALL)
ICM_DEF( WE_SHAPE_ENCODE, ICM_TRACE_NONE)
ICM_INT( arg_cnt)
ICM_UINT( arg_cnt)
ICM_VARANY( arg_cnt, arg)
ICM_END( WE_SHAPE_ENCODE, ( arg_cnt, arg))
#endif
#if defined(WE_NO_SHAPE_ENCODE) || defined(ICM_ALL)
ICM_DEF( WE_NO_SHAPE_ENCODE, ICM_TRACE_NONE)
ICM_INT( arg_cnt)
ICM_UINT( arg_cnt)
ICM_END( WE_NO_SHAPE_ENCODE, ( arg_cnt))
#endif
......@@ -113,7 +113,7 @@ ICM_DEF( WE_FUN_AP, ICM_TRACE(fun))
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( WE_FUN_AP, (name, rettype_NT, retname, vararg_cnt, vararg))
#endif
......@@ -122,7 +122,7 @@ ICM_END( WE_FUN_AP, (name, rettype_NT, retname, vararg_cnt, vararg))
ICM_DEF( WE_FUN_DEF_END, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( WE_FUN_DEF_END, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -135,7 +135,7 @@ ICM_DEF( RTSPEC_FUN_AP, ICM_TRACE(fun))
ICM_ID( uuid)
ICM_NT( rettype_NT)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (5*vararg_cnt), vararg)
ICM_END( RTSPEC_FUN_AP, (modname, name, srcname, uuid, rettype_NT, retname, vararg_cnt, vararg))
#endif
......@@ -144,20 +144,20 @@ ICM_END( RTSPEC_FUN_AP, (modname, name, srcname, uuid, rettype_NT, retname, vara
ICM_DEF( ND_FUN_AP, ICM_TRACE(fun))
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_FUN_AP, (name, retname, vararg_cnt, vararg))
#endif
#if defined(ND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS) || defined(ICM_ALL)
ICM_DEF( ND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS, ICM_TRACE(fun))
ICM_INT( vararg_NT_cnt)
ICM_UINT( vararg_NT_cnt)
ICM_VARANY( (vararg_NT_cnt), vararg_NT)
ICM_ID( rettype)
ICM_NT( ret_NT)
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS, (vararg_NT_cnt, vararg_NT, rettype, ret_NT, name, retname, vararg_cnt, vararg))
#endif
......@@ -166,7 +166,7 @@ ICM_END( ND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS, (vararg_NT_cnt, vararg_NT, rettype
ICM_DEF( MUTC_THREADFUN_AP, ICM_TRACE(fun))
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_THREADFUN_AP, (name, retname, vararg_cnt, vararg))
#endif
......@@ -177,7 +177,7 @@ ICM_DEF( MUTC_SPAWNFUN_AP, ICM_TRACE(fun))
ICM_ID( place)
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_SPAWNFUN_AP, (var_NT, place, name, retname, vararg_cnt, vararg))
#endif
......@@ -186,7 +186,7 @@ ICM_END( MUTC_SPAWNFUN_AP, (var_NT, place, name, retname, vararg_cnt, vararg))
ICM_DEF( MUTC_FUNTHREADFUN_AP, ICM_TRACE(fun))
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_FUNTHREADFUN_AP, (name, retname, vararg_cnt, vararg))
#endif
......@@ -194,7 +194,7 @@ ICM_END( MUTC_FUNTHREADFUN_AP, (name, retname, vararg_cnt, vararg))
#if defined(ND_FUN_RET) || defined(ICM_ALL)
ICM_DEF( ND_FUN_RET, ICM_TRACE(fun))
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( ND_FUN_RET, (retname, vararg_cnt, vararg))
#endif
......@@ -202,7 +202,7 @@ ICM_END( ND_FUN_RET, (retname, vararg_cnt, vararg))
#if defined(MUTC_THREADFUN_RET) || defined(ICM_ALL)
ICM_DEF( MUTC_THREADFUN_RET, ICM_TRACE(fun))
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MUTC_THREADFUN_RET, (retname, vararg_cnt, vararg))
#endif
......@@ -1048,7 +1048,7 @@ ICM_END( WL_SET_OFFSET, (off_NT, dim, first_block_dim, to_NT, to_sdim,
ICM_DEF( MT_MTFUN_DECL, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_MTFUN_DECL, (funname, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -1057,7 +1057,7 @@ ICM_END( MT_MTFUN_DECL, (funname, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MT_MTFUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_MTFUN_DEF_BEGIN, (funname, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -1066,7 +1066,7 @@ ICM_END( MT_MTFUN_DEF_BEGIN, (funname, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MT_MTFUN_DEF_END, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_MTFUN_DEF_END, (funname, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -1075,7 +1075,7 @@ ICM_END( MT_MTFUN_DEF_END, (funname, rettype_NT, vararg_cnt, vararg))
ICM_DEF( MT_MTFUN_AP, ICM_TRACE(fun))
ICM_ID( funname)
ICM_ID( retname_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_MTFUN_AP, (funname, retname_NT, vararg_cnt, vararg))
#endif
......@@ -1083,7 +1083,7 @@ ICM_END( MT_MTFUN_AP, (funname, retname_NT, vararg_cnt, vararg))
#if defined(MT_MTFUN_RET) || defined(ICM_ALL)
ICM_DEF( MT_MTFUN_RET, ICM_TRACE(fun))
ICM_ID( retname_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_MTFUN_RET, (retname_NT, vararg_cnt, vararg))
#endif
......@@ -1175,7 +1175,7 @@ ICM_END( MT_SMART_EXPR_PROBLEM_SIZE_END, ( operation))
#if defined(MT_SPMDFUN_DECL) || defined(ICM_ALL)
ICM_DEF( MT_SPMDFUN_DECL, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMDFUN_DECL, (funname, vararg_cnt, vararg))
#endif
......@@ -1183,7 +1183,7 @@ ICM_END( MT_SPMDFUN_DECL, (funname, vararg_cnt, vararg))
#if defined(MT_SPMDFUN_DEF_BEGIN) || defined(ICM_ALL)
ICM_DEF( MT_SPMDFUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMDFUN_DEF_BEGIN, (funname, vararg_cnt, vararg))
#endif
......@@ -1191,7 +1191,7 @@ ICM_END( MT_SPMDFUN_DEF_BEGIN, (funname, vararg_cnt, vararg))
#if defined(MT_SPMDFUN_DEF_END) || defined(ICM_ALL)
ICM_DEF( MT_SPMDFUN_DEF_END, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMDFUN_DEF_END, (funname, vararg_cnt, vararg))
#endif
......@@ -1199,7 +1199,7 @@ ICM_END( MT_SPMDFUN_DEF_END, (funname, vararg_cnt, vararg))
#if defined(MT_SPMDFUN_RET) || defined(ICM_ALL)
ICM_DEF( MT_SPMDFUN_RET, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (6*vararg_cnt), vararg)
ICM_END( MT_SPMDFUN_RET, (funname, vararg_cnt, vararg))
#endif
......@@ -1207,7 +1207,7 @@ ICM_END( MT_SPMDFUN_RET, (funname, vararg_cnt, vararg))
#if defined(MT_SPMDFUN_AP) || defined(ICM_ALL)
ICM_DEF( MT_SPMDFUN_AP, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMDFUN_AP, (funname, vararg_cnt, vararg))
#endif
......@@ -1215,7 +1215,7 @@ ICM_END( MT_SPMDFUN_AP, (funname, vararg_cnt, vararg))
#if defined(MT_SPMD_FRAME_ELEMENT) || defined(ICM_ALL)
ICM_DEF( MT_SPMD_FRAME_ELEMENT, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMD_FRAME_ELEMENT, (funname, vararg_cnt, vararg))
#endif
......@@ -1223,7 +1223,7 @@ ICM_END( MT_SPMD_FRAME_ELEMENT, (funname, vararg_cnt, vararg))
#if defined(MT_SPMD_BARRIER_ELEMENT) || defined(ICM_ALL)
ICM_DEF( MT_SPMD_BARRIER_ELEMENT, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( MT_SPMD_BARRIER_ELEMENT, (funname, vararg_cnt, vararg))
#endif
......@@ -1235,7 +1235,7 @@ ICM_END( MT_SPMD_BARRIER_ELEMENT, (funname, vararg_cnt, vararg))
#if defined(CUDA_GLOBALFUN_AP) || defined(ICM_ALL)
ICM_DEF( CUDA_GLOBALFUN_AP, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (4*vararg_cnt), vararg)
ICM_END( CUDA_GLOBALFUN_AP, (funname, vararg_cnt, vararg))
#endif
......@@ -1243,7 +1243,7 @@ ICM_END( CUDA_GLOBALFUN_AP, (funname, vararg_cnt, vararg))
#if defined(CUDA_ST_GLOBALFUN_AP) || defined(ICM_ALL)
ICM_DEF( CUDA_ST_GLOBALFUN_AP, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (4*vararg_cnt), vararg)
ICM_END( CUDA_ST_GLOBALFUN_AP, (funname, vararg_cnt, vararg))
#endif
......@@ -1251,7 +1251,7 @@ ICM_END( CUDA_ST_GLOBALFUN_AP, (funname, vararg_cnt, vararg))
#if defined(CUDA_GLOBALFUN_RET) || defined(ICM_ALL)
ICM_DEF( CUDA_GLOBALFUN_RET, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( CUDA_GLOBALFUN_RET, (funname, vararg_cnt, vararg))
#endif
......@@ -1259,7 +1259,7 @@ ICM_END( CUDA_GLOBALFUN_RET, (funname, vararg_cnt, vararg))
#if defined(CUDA_GLOBALFUN_DECL) || defined(ICM_ALL)
ICM_DEF( CUDA_GLOBALFUN_DECL, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (4*vararg_cnt), vararg)
ICM_END( CUDA_GLOBALFUN_DECL, (funname, vararg_cnt, vararg))
#endif
......@@ -1267,7 +1267,7 @@ ICM_END( CUDA_GLOBALFUN_DECL, (funname, vararg_cnt, vararg))
#if defined(CUDA_GLOBALFUN_DEF_BEGIN) || defined(ICM_ALL)
ICM_DEF( CUDA_GLOBALFUN_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (4*vararg_cnt), vararg)
ICM_END( CUDA_GLOBALFUN_DEF_BEGIN, (funname, vararg_cnt, vararg))
#endif
......@@ -1275,7 +1275,7 @@ ICM_END( CUDA_GLOBALFUN_DEF_BEGIN, (funname, vararg_cnt, vararg))
#if defined(CUDA_GLOBALFUN_DEF_END) || defined(ICM_ALL)
ICM_DEF( CUDA_GLOBALFUN_DEF_END, ICM_TRACE_NONE)
ICM_ID( funname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (4*vararg_cnt), vararg)
ICM_END( CUDA_GLOBALFUN_DEF_END, (funname, vararg_cnt, vararg))
#endif
......@@ -1339,7 +1339,7 @@ ICM_END( CUDA_MEM_TRANSFER, (to_NT, from_NT, basetype, direction))
#if defined( CUDA_GRID_BLOCK) || defined(ICM_ALL)
ICM_DEF( CUDA_GRID_BLOCK, ICM_TRACE_NONE)
ICM_INT( bounds_count)
ICM_UINT( bounds_count)
ICM_VARANY( (bounds_count), var_ANY)
ICM_END( CUDA_GRID_BLOCK, (bounds_count, var_ANY))
#endif
......@@ -1581,7 +1581,7 @@ ICM_DEF( MT_SCHEDULER_Static_BEGIN, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1594,7 +1594,7 @@ ICM_DEF( MT_SCHEDULER_Static_END, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1607,7 +1607,7 @@ ICM_DEF( MT_SCHEDULER_Static_INIT, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1623,7 +1623,7 @@ ICM_DEF( MT_SCHEDULER_Self_BEGIN, ICM_TRACE_NONE)
ICM_ID( first_task)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1637,7 +1637,7 @@ ICM_DEF( MT_SCHEDULER_Self_END, ICM_TRACE_NONE)
ICM_ID( first_task)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1651,7 +1651,7 @@ ICM_DEF( MT_SCHEDULER_Self_INIT, ICM_TRACE_NONE)
ICM_ID( first_task)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1666,7 +1666,7 @@ ICM_DEF( MT_SCHEDULER_Affinity_BEGIN, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1679,7 +1679,7 @@ ICM_DEF( MT_SCHEDULER_Affinity_END, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1692,7 +1692,7 @@ ICM_DEF( MT_SCHEDULER_Affinity_INIT, ICM_TRACE_NONE)
ICM_INT( sched_id)
ICM_ID( ts_name)
ICM_INT( ts_dims)
ICM_INT( ts_arg_num)
ICM_UINT( ts_arg_num)
ICM_VARANY( (ts_arg_num), ts_args)
ICM_INT( dim)
ICM_VARANY( (4*dim), vararg)
......@@ -1702,24 +1702,24 @@ ICM_END( MT_SCHEDULER_Affinity_INIT, (sched_id, ts_name, ts_dims,
#if defined(DISPATCH_ERROR) || defined(ICM_ALL)
ICM_DEF( DISPATCH_ERROR, ICM_TRACE_NONE)
ICM_INT( cnt_to)
ICM_UINT( cnt_to)
ICM_VARANY( (cnt_to), to_ANY)
ICM_STR( funname)
ICM_INT( cnt_from)
ICM_UINT( cnt_from)
ICM_VARANY( (cnt_from), from_ANY)
ICM_END( DISPATCH_ERROR, (cnt_to, to_ANY, funname, cnt_from, from_ANY))
#endif
#if defined(ND_PRF_PROP_OBJ_IN) || defined(ICM_ALL)
ICM_DEF( ND_PRF_PROP_OBJ_IN, ICM_TRACE_NONE)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (2*vararg_cnt), vararg)
ICM_END( ND_PRF_PROP_OBJ_IN, (vararg_cnt, vararg))
#endif
#if defined(ND_PRF_PROP_OBJ_OUT) || defined(ICM_ALL)
ICM_DEF( ND_PRF_PROP_OBJ_OUT, ICM_TRACE_NONE)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (2*vararg_cnt), vararg)
ICM_END( ND_PRF_PROP_OBJ_OUT, (vararg_cnt, vararg))
#endif
......@@ -1729,7 +1729,7 @@ ICM_END( ND_PRF_PROP_OBJ_OUT, (vararg_cnt, vararg))
ICM_DEF( FP_SLOWCLONE_DECL, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( FP_SLOWCLONE_DECL, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -1738,7 +1738,7 @@ ICM_END( FP_SLOWCLONE_DECL, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( FP_SLOWCLONE_DEF_BEGIN, ICM_TRACE_NONE)
ICM_ID( name)
ICM_NT( rettype_NT)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( FP_SLOWCLONE_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
#endif
......@@ -1747,7 +1747,7 @@ ICM_END( FP_SLOWCLONE_DEF_BEGIN, (name, rettype_NT, vararg_cnt, vararg))
ICM_DEF( FP_FUN_RET, ICM_TRACE(fun))
ICM_ID( framename)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( FP_FUN_RET, (framename, retname, vararg_cnt, vararg))
#endif
......@@ -1757,7 +1757,7 @@ ICM_DEF( FP_FUN_AP, ICM_TRACE(fun))
ICM_ID( framename)
ICM_ID( name)
ICM_ID( retname)
ICM_INT( vararg_cnt)
ICM_UINT( vararg_cnt)
ICM_VARANY( (3*vararg_cnt), vararg)
ICM_END( FP_FUN_AP, (framename, name, retname, vararg_cnt, vararg))
#endif
......
src/libsac2c/codegen/icm2c_cuda.c
+ 14
- 11
View file @ 3637690e
......@@ -24,9 +24,10 @@
#endif /* BEtest */
static void
CompileCUDA_GLOBALFUN_HEADER (char *funname, int vararg_cnt, char **vararg)
CompileCUDA_GLOBALFUN_HEADER (char *funname, unsigned int vararg_cnt, char **vararg)
{
int i, j, dim;
int j, dim;
unsigned int i;
char *basetype;
DBUG_ENTER ();
......@@ -81,7 +82,7 @@ CompileCUDA_GLOBALFUN_HEADER (char *funname, int vararg_cnt, char **vararg)
*
******************************************************************************/
void
ICMCompileCUDA_GLOBALFUN_DECL (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_GLOBALFUN_DECL (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -107,7 +108,7 @@ ICMCompileCUDA_GLOBALFUN_DECL (char *funname, int vararg_cnt, char **vararg)
*
******************************************************************************/
void
ICMCompileCUDA_GLOBALFUN_DEF_BEGIN (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_GLOBALFUN_DEF_BEGIN (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -133,7 +134,7 @@ ICMCompileCUDA_GLOBALFUN_DEF_BEGIN (char *funname, int vararg_cnt, char **vararg
*
******************************************************************************/
void
ICMCompileCUDA_GLOBALFUN_RET (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_GLOBALFUN_RET (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -153,7 +154,7 @@ ICMCompileCUDA_GLOBALFUN_RET (char *funname, int vararg_cnt, char **vararg)
*
******************************************************************************/
void
ICMCompileCUDA_GLOBALFUN_DEF_END (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_GLOBALFUN_DEF_END (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -178,9 +179,10 @@ ICMCompileCUDA_GLOBALFUN_DEF_END (char *funname, int vararg_cnt, char **vararg)
*
******************************************************************************/
void
ICMCompileCUDA_GLOBALFUN_AP (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_GLOBALFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg)
{
int dim, i, j;
int dim, j;
unsigned int i;
char *basetype;
DBUG_ENTER ();
......@@ -259,7 +261,7 @@ ICMCompileCUDA_GLOBALFUN_AP (char *funname, int vararg_cnt, char **vararg)
*
******************************************************************************/
void
ICMCompileCUDA_GRID_BLOCK (int bounds_count, char **var_ANY)
ICMCompileCUDA_GRID_BLOCK (unsigned int bounds_count, char **var_ANY)
{
DBUG_ENTER ();
......@@ -434,9 +436,10 @@ ICMCompileCUDA_GRID_BLOCK (int bounds_count, char **var_ANY)
*
******************************************************************************/
void
ICMCompileCUDA_ST_GLOBALFUN_AP (char *funname, int vararg_cnt, char **vararg)
ICMCompileCUDA_ST_GLOBALFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg)
{
int dim, i, j;
int dim, j;
unsigned int i;
char *basetype;
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_cuda.h
+ 7
- 7
View file @ 3637690e
......@@ -4,14 +4,14 @@
#include "types.h"
extern void ICMCompileCUDA_GLOBALFUN_DECL (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_DEF_BEGIN (char *funname, int vararg_cnt,
extern void ICMCompileCUDA_GLOBALFUN_DECL (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_DEF_BEGIN (char *funname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_DEF_END (char *funname, int vararg_cnt,
extern void ICMCompileCUDA_GLOBALFUN_DEF_END (char *funname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_AP (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_ST_GLOBALFUN_AP (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_RET (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_ST_GLOBALFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_GLOBALFUN_RET (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileCUDA_WLIDS (char *wlids_NT, int wlids_NT_dim, int array_dim,
int wlids_dim, char *iv_NT, char *hasstepwith);
......@@ -23,7 +23,7 @@ extern void ICMCompileCUDA_WL_ASSIGN (char *val_NT, int val_sdim, char *to_NT,
int to_sdim, char *off_NT);
extern void ICMCompileCUDA_MEM_TRANSFER (char *to_NT, char *from_NT, char *basetype,
char *direction);
extern void ICMCompileCUDA_GRID_BLOCK (int bounds_count, char **var_ANY);
extern void ICMCompileCUDA_GRID_BLOCK (unsigned int bounds_count, char **var_ANY);
extern void ICMCompileCUDA_WL_SUBALLOC (char *sub_NT, int sub_dim, char *to_NT,
int to_dim, char *off_NT);
extern void ICMCompileCUDA_PRF_IDX_MODARRAY_AxSxA__DATA (char *to_NT, int to_sdim,
......
src/libsac2c/codegen/icm2c_error.c
+ 2
- 2
View file @ 3637690e
......@@ -26,10 +26,10 @@
******************************************************************************/
void
ICMCompileDISPATCH_ERROR (int cnt_to, char **to_ANY, char *funname, int cnt_from,
ICMCompileDISPATCH_ERROR (unsigned int cnt_to, char **to_ANY, char *funname, unsigned int cnt_from,
char **from_ANY)
{
int i;
unsigned int i;
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_error.h
+ 2
- 2
View file @ 3637690e
#ifndef _SAC_ICM2C_ERROR_H_
#define _SAC_ICM2C_ERROR_H_
extern void ICMCompileDISPATCH_ERROR (int cnt_to, char **to_ANY, char *funname,
int cnt_from, char **from_ANY);
extern void ICMCompileDISPATCH_ERROR (unsigned int cnt_to, char **to_ANY, char *funname,
unsigned int cnt_from, char **from_ANY);
#endif /* _SAC_ICM2C_ERROR_H_ */
src/libsac2c/codegen/icm2c_fp.c
+ 5
- 5
View file @ 3637690e
......@@ -36,7 +36,7 @@
#define ScanArglist(cnt, inc, sep_str, sep_code, code) \
{ \
int i; \
unsigned int i; \
for (i = 0; i < cnt * inc; i += inc) { \
if (i > 0) { \
fprintf (global.outfile, "%s", sep_str); \
......@@ -63,7 +63,7 @@
******************************************************************************/
void
ICMCompileFP_SLOWCLONE_DECL (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileFP_SLOWCLONE_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -80,7 +80,7 @@ ICMCompileFP_SLOWCLONE_DECL (char *name, char *rettype_NT, int vararg_cnt, char
}
void
ICMCompileFP_SLOWCLONE_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
ICMCompileFP_SLOWCLONE_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -107,7 +107,7 @@ ICMCompileFP_SLOWCLONE_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
}
void
ICMCompileFP_FUN_RET (char *framename, char *retname, int vararg_cnt, char **vararg)
ICMCompileFP_FUN_RET (char *framename, char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -132,7 +132,7 @@ ICMCompileFP_FUN_RET (char *framename, char *retname, int vararg_cnt, char **var
}
void
ICMCompileFP_FUN_AP (char *framename, char *name, char *retname, int vararg_cnt,
ICMCompileFP_FUN_AP (char *framename, char *name, char *retname, unsigned int vararg_cnt,
char **vararg)
{
char *tmp;
......
src/libsac2c/codegen/icm2c_fp.h
+ 4
- 4
View file @ 3637690e
......@@ -17,13 +17,13 @@
#include "types.h"
extern void ICMCompileFP_SLOWCLONE_DECL (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileFP_SLOWCLONE_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileFP_SLOWCLONE_DEF_BEGIN (char *name, char *rettype_NT,
int vararg_cnt, char **vararg);
extern void ICMCompileFP_FUN_RET (char *framename, char *retname, int vararg_cnt,
unsigned int vararg_cnt, char **vararg);
extern void ICMCompileFP_FUN_RET (char *framename, char *retname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileFP_FUN_AP (char *framename, char *name, char *retname,
int vararg_cnt, char **vararg);
unsigned int vararg_cnt, char **vararg);
#endif /* _SAC_ICM2C_FP_H_ */
src/libsac2c/codegen/icm2c_mt.c
+ 20
- 19
View file @ 3637690e
......@@ -35,7 +35,7 @@
#define ScanArglist(cnt, inc, sep_str, sep_code, code) \
{ \
int i; \
size_t i; \
for (i = 0; i < cnt * inc; i += inc) { \
if (i > 0) { \
fprintf (global.outfile, "%s", sep_str); \
......@@ -239,7 +239,7 @@ ICMCompileMT_SMART_EXPR_PROBLEM_SIZE_END (int operation)
******************************************************************************/
void
ICMCompileMT_SPMDFUN_DECL (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMDFUN_DECL (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -274,9 +274,9 @@ ICMCompileMT_SPMDFUN_DECL (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMDFUN_DEF_BEGIN (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMDFUN_DEF_BEGIN (char *funname, unsigned int vararg_cnt, char **vararg)
{
int i;
size_t i;
int cnt;
DBUG_ENTER ();
......@@ -327,7 +327,7 @@ ICMCompileMT_SPMDFUN_DEF_BEGIN (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMDFUN_DEF_END (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMDFUN_DEF_END (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -360,7 +360,7 @@ ICMCompileMT_SPMDFUN_DEF_END (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMDFUN_AP (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMDFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -374,7 +374,7 @@ ICMCompileMT_SPMDFUN_AP (char *funname, int vararg_cnt, char **vararg)
/* send variables to the frame */
int cnt = 0;
for (int i = 0; i < 3 * vararg_cnt; i += 3) {
for (size_t i = 0; i < 3 * vararg_cnt; i += 3) {
INDENT;
fprintf (global.outfile, "SAC_MT_SEND_PARAM_%s( %s, %d, %s)\n", vararg[i],
funname, cnt++, vararg[i + 2]);
......@@ -385,7 +385,7 @@ ICMCompileMT_SPMDFUN_AP (char *funname, int vararg_cnt, char **vararg)
/* receive results via the frame */
cnt = 0;
for (int i = 0; i < 3 * vararg_cnt; i += 3) {
for (size_t i = 0; i < 3 * vararg_cnt; i += 3) {
INDENT;
fprintf (global.outfile, "SAC_MT_RECEIVE_RESULT_%s( %s, 0, %d, %s)\n", vararg[i],
funname, cnt++, vararg[i + 2]);
......@@ -417,9 +417,10 @@ ICMCompileMT_SPMDFUN_AP (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMDFUN_RET (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMDFUN_RET (char *funname, unsigned int vararg_cnt, char **vararg)
{
int i, cnt;
size_t i;
int cnt;
DBUG_ENTER ();
......@@ -483,7 +484,7 @@ ICMCompileMT_SPMDFUN_RET (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_MTFUN_DECL (char *funname, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileMT_MTFUN_DECL (char *funname, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -532,7 +533,7 @@ ICMCompileMT_MTFUN_DECL (char *funname, char *rettype_NT, int vararg_cnt, char *
******************************************************************************/
void
ICMCompileMT_MTFUN_DEF_BEGIN (char *funname, char *rettype_NT, int vararg_cnt,
ICMCompileMT_MTFUN_DEF_BEGIN (char *funname, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -588,7 +589,7 @@ ICMCompileMT_MTFUN_DEF_BEGIN (char *funname, char *rettype_NT, int vararg_cnt,
******************************************************************************/
void
ICMCompileMT_MTFUN_DEF_END (char *funname, char *rettype_NT, int vararg_cnt,
ICMCompileMT_MTFUN_DEF_END (char *funname, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -623,7 +624,7 @@ ICMCompileMT_MTFUN_DEF_END (char *funname, char *rettype_NT, int vararg_cnt,
******************************************************************************/
void
ICMCompileMT_MTFUN_AP (char *funname, char *retname_NT, int vararg_cnt, char **vararg)
ICMCompileMT_MTFUN_AP (char *funname, char *retname_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -666,7 +667,7 @@ ICMCompileMT_MTFUN_AP (char *funname, char *retname_NT, int vararg_cnt, char **v
******************************************************************************/
void
ICMCompileMT_MTFUN_RET (char *retname_NT, int vararg_cnt, char **vararg)
ICMCompileMT_MTFUN_RET (char *retname_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -710,9 +711,9 @@ ICMCompileMT_MTFUN_RET (char *retname_NT, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMD_FRAME_ELEMENT (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMD_FRAME_ELEMENT (char *funname, unsigned int vararg_cnt, char **vararg)
{
int i;
size_t i;
int cnt;
DBUG_ENTER ();
......@@ -755,9 +756,9 @@ ICMCompileMT_SPMD_FRAME_ELEMENT (char *funname, int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileMT_SPMD_BARRIER_ELEMENT (char *funname, int vararg_cnt, char **vararg)
ICMCompileMT_SPMD_BARRIER_ELEMENT (char *funname, unsigned int vararg_cnt, char **vararg)
{
int i;
size_t i;
int cnt;
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_mt.h
+ 12
- 12
View file @ 3637690e
......@@ -35,25 +35,25 @@ extern void ICMCompileMT_SMART_EXPR_PROBLEM_SIZE_CxC (char *inf, char *sup,
int operation);
extern void ICMCompileMT_SMART_EXPR_PROBLEM_SIZE_END (int operation);
extern void ICMCompileMT_SPMDFUN_DECL (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_DEF_BEGIN (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_DEF_END (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_RET (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_AP (char *funname, int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_DECL (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_DEF_BEGIN (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_DEF_END (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_RET (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_SPMDFUN_AP (char *funname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_MTFUN_DECL (char *funname, char *rettype_NT, int vararg_cnt,
extern void ICMCompileMT_MTFUN_DECL (char *funname, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMT_MTFUN_DEF_BEGIN (char *funname, char *rettype_NT, int vararg_cnt,
extern void ICMCompileMT_MTFUN_DEF_BEGIN (char *funname, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMT_MTFUN_DEF_END (char *funname, char *rettype_NT, int vararg_cnt,
extern void ICMCompileMT_MTFUN_DEF_END (char *funname, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMT_MTFUN_RET (char *retname_NT, int vararg_cnt, char **vararg);
extern void ICMCompileMT_MTFUN_AP (char *funname, char *retname_NT, int vararg_cnt,
extern void ICMCompileMT_MTFUN_RET (char *retname_NT, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMT_MTFUN_AP (char *funname, char *retname_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMT_SPMD_FRAME_ELEMENT (char *funname, int vararg_cnt,
extern void ICMCompileMT_SPMD_FRAME_ELEMENT (char *funname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMT_SPMD_BARRIER_ELEMENT (char *funname, int vararg_cnt,
extern void ICMCompileMT_SPMD_BARRIER_ELEMENT (char *funname, unsigned int vararg_cnt,
char **vararg);
#endif /* _SAC_ICM2C_MT_H_ */
src/libsac2c/codegen/icm2c_prf.c
+ 4
- 4
View file @ 3637690e
......@@ -1901,9 +1901,9 @@ ICMCompileND_PRF_CAT_VxV__SHAPE (char *to_NT, int to_sdim, char *from1_NT, int f
******************************************************************************/
void
ICMCompileND_PRF_PROP_OBJ_IN (int vararg_cnt, char **vararg)
ICMCompileND_PRF_PROP_OBJ_IN (unsigned int vararg_cnt, char **vararg)
{
int i;
unsigned int i;
DBUG_ENTER ();
#define ND_PRF_PROP_OBJ_IN
......@@ -1935,9 +1935,9 @@ ICMCompileND_PRF_PROP_OBJ_IN (int vararg_cnt, char **vararg)
******************************************************************************/
void
ICMCompileND_PRF_PROP_OBJ_OUT (int vararg_cnt, char **vararg)
ICMCompileND_PRF_PROP_OBJ_OUT (unsigned int vararg_cnt, char **vararg)
{
int i;
unsigned int i;
DBUG_ENTER ();
#define ND_PRF_PROP_OBJ_OUT
......
src/libsac2c/codegen/icm2c_prf.h
+ 2
- 2
View file @ 3637690e
......@@ -107,9 +107,9 @@ extern void ICMCompileND_PRF_SHAPE_SEL__DATA_id (char *to_NT, int to_sdim, char
extern void ICMCompileND_PRF_IDX_SHAPE_SEL__DATA (char *to_NT, int to_sdim, char *from_NT,
int from_sdim, char *idx_ANY);
extern void ICMCompileND_PRF_PROP_OBJ_IN (int vararg_cnt, char **vararg);
extern void ICMCompileND_PRF_PROP_OBJ_IN (unsigned int vararg_cnt, char **vararg);
extern void ICMCompileND_PRF_PROP_OBJ_OUT (int vararg_cnt, char **vararg);
extern void ICMCompileND_PRF_PROP_OBJ_OUT (unsigned int vararg_cnt, char **vararg);
extern void ICMCompileND_PRF_TYPE_CONSTRAINT_AKS (char *to_NT, char *from_NT, int dim,
int *shp);
......
src/libsac2c/codegen/icm2c_rtspec.c
+ 12
- 12
View file @ 3637690e
......@@ -27,7 +27,7 @@
// this is used for RTSPEC_MODE_SIMPLE
#define ScanArglist(cnt, inc, sep_str, sep_code, code) \
{ \
int i; \
unsigned int i; \
for (i = 0; i < cnt * inc; i += inc) { \
if (i > 0) { \
fprintf (global.outfile, "%s", sep_str); \
......@@ -40,7 +40,7 @@
// this is used for all other modes
#define SCAN_ARG_LIST(cnt, inc, sep_str, sep_code, code) \
do { \
for (int i = 0; i < cnt * inc; i += inc) { \
for (unsigned int i = 0; i < cnt * inc; i += inc) { \
if (i > 0) { \
out ("%s", sep_str); \
sep_code; \
......@@ -53,7 +53,7 @@
*
* function:
* void ICMCompileND_FUN_DEF_BEGIN( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -64,7 +64,7 @@
*
******************************************************************************/
void
ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -107,7 +107,7 @@ ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char *
/** <!--*******************************************************************-->
*
* @fn ICMCompileRTSPEC_FUN_AP( char *modname, char *name, char *srcname, char *uuid
* char *rettype_NT, char *retname, int vararg_cnt,
* char *rettype_NT, char *retname, unsigned int vararg_cnt,
* char **vararg)
*
* @brief Implements the ICM for the function application with runtime
......@@ -116,7 +116,7 @@ ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char *
****************************************************************************/
void
ICMCompileRTSPEC_FUN_AP (char *modname, char *name, char *srcname, char *uuid,
char *rettype_NT, char *retname, int vararg_cnt, char **vararg)
char *rettype_NT, char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -150,7 +150,7 @@ ICMCompileRTSPEC_FUN_AP (char *modname, char *name, char *srcname, char *uuid,
*/
size_t type_string_size = 1;
int i = 0;
unsigned int i = 0;
int arg_cnt = 0;
i = 0;
......@@ -245,7 +245,7 @@ ICMCompileRTSPEC_FUN_AP (char *modname, char *name, char *srcname, char *uuid,
/** <!--*******************************************************************-->
*
* @fn ICMCompileWE_FUN_AP( char *name, char *retname, int vararg_cnt,
* @fn ICMCompileWE_FUN_AP( char *name, char *retname, unsigned int vararg_cnt,
* char **vararg)
*
* @brief Implements the ICM for the function application of an indirect wrapper
......@@ -254,7 +254,7 @@ ICMCompileRTSPEC_FUN_AP (char *modname, char *name, char *srcname, char *uuid,
*
****************************************************************************/
void
ICMCompileWE_FUN_AP (char *name, char *rettype_NT, char *retname, int vararg_cnt,
ICMCompileWE_FUN_AP (char *name, char *rettype_NT, char *retname, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -275,7 +275,7 @@ ICMCompileWE_FUN_AP (char *name, char *rettype_NT, char *retname, int vararg_cnt
*/
size_t type_string_size = 1;
int i = 0;
unsigned int i = 0;
for (; i < vararg_cnt * 3; i += 3) {
if (STReq (vararg[i], "in")) {
type_string_size += STRlen (vararg[i + 1]) + 1;
......@@ -425,7 +425,7 @@ ICMCompileWE_NO_SHAPE_ENCODE (int arg_cnt)
*
* function:
* void ICMCompileWE_FUN_DEF_END( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -439,7 +439,7 @@ ICMCompileWE_NO_SHAPE_ENCODE (int arg_cnt)
******************************************************************************/
void
ICMCompileWE_FUN_DEF_END (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileWE_FUN_DEF_END (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_rtspec.h
+ 6
- 6
View file @ 3637690e
......@@ -12,23 +12,23 @@
#ifndef _SAC_ICM2C_RTSPEC_H_
#define _SAC_ICM2C_RTSPEC_H_
extern void ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileWE_FUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileWE_FUN_DEF_END (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileWE_FUN_DEF_END (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileWE_FUN_AP (char *name, char *rettype_NT, char *retname,
int vararg_cnt, char **vararg);
unsigned int vararg_cnt, char **vararg);
extern void ICMCompileRTSPEC_FUN_AP (char *modname, char *name, char *srcname, char *uuid,
char *rettype_NT, char *retname, int vararg_cnt,
char *rettype_NT, char *retname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileWE_MODFUN_INFO (char *name, char *module);
extern void ICMCompileWE_SHAPE_ENCODE (int arg_cnt, char **arg);
extern void ICMCompileWE_SHAPE_ENCODE (unsigned int arg_cnt, char **arg);
extern void ICMCompileWE_NO_SHAPE_ENCODE (int arg_cnt);
extern void ICMCompileWE_NO_SHAPE_ENCODE (unsigned int arg_cnt);
#endif /* _SAC_ICM2C_RTSPEC_H_ */
src/libsac2c/codegen/icm2c_sched.c
+ 14
- 13
View file @ 3637690e
......@@ -84,7 +84,7 @@ InitializeBoundaries (int dim, char **vararg)
*
******************************************************************************/
static void
TaskSelectorInit (int sched_id, char *ts_name, int ts_dims, int ts_arg_num,
TaskSelectorInit (int sched_id, char *ts_name, int ts_dims, unsigned int ts_arg_num,
char **ts_args, int dim, char **vararg)
{
......@@ -137,7 +137,7 @@ TaskSelectorInit (int sched_id, char *ts_name, int ts_dims, int ts_arg_num,
******************************************************************************/
static void
TaskSelector (int sched_id, char *ts_name, int ts_dims, int ts_arg_num, char **ts_args,
TaskSelector (int sched_id, char *ts_name, int ts_dims, unsigned int ts_arg_num, char **ts_args,
int dim, char **vararg, char *taskid, char *worktodo)
{
char **lower_bound = vararg;
......@@ -146,6 +146,7 @@ TaskSelector (int sched_id, char *ts_name, int ts_dims, int ts_arg_num, char **t
char **sched_dims = vararg + 3 * dim;
int *tasks_on_dim;
int i, pos;
unsigned int j;
DBUG_ENTER ();
......@@ -180,8 +181,8 @@ TaskSelector (int sched_id, char *ts_name, int ts_dims, int ts_arg_num, char **t
for (i = 0; i < ts_dims; i++) {
fprintf (global.outfile, "%s,", unrolling[tasks_on_dim[i]]);
}
for (i = 0; i < ts_arg_num; i++) {
fprintf (global.outfile, "%s,", ts_args[i]);
for (j = 0; j < ts_arg_num; j++) {
fprintf (global.outfile, "%s,", ts_args[j]);
}
fprintf (global.outfile, "%s, %s);\n", taskid, worktodo);
......@@ -646,7 +647,7 @@ ICMCompileMT_SCHEDULER_BlockVarDist_INIT (int sched_id, int dim, char **vararg)
void
ICMCompileMT_SCHEDULER_Static_BEGIN (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -676,7 +677,7 @@ ICMCompileMT_SCHEDULER_Static_BEGIN (int sched_id, char *ts_name, int ts_dims,
void
ICMCompileMT_SCHEDULER_Static_END (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim, char **vararg)
unsigned int ts_arg_num, char **ts_args, int dim, char **vararg)
{
DBUG_ENTER ();
......@@ -700,7 +701,7 @@ ICMCompileMT_SCHEDULER_Static_END (int sched_id, char *ts_name, int ts_dims,
void
ICMCompileMT_SCHEDULER_Static_INIT (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -756,7 +757,7 @@ ICMCompileMT_SCHEDULER_Static_INIT (int sched_id, char *ts_name, int ts_dims,
void
ICMCompileMT_SCHEDULER_Self_BEGIN (int sched_id, char *first_task, char *ts_name,
int ts_dims, int ts_arg_num, char **ts_args, int dim,
int ts_dims, unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -809,7 +810,7 @@ ICMCompileMT_SCHEDULER_Self_BEGIN (int sched_id, char *first_task, char *ts_name
void
ICMCompileMT_SCHEDULER_Self_END (int sched_id, char *first_task, char *ts_name,
int ts_dims, int ts_arg_num, char **ts_args, int dim,
int ts_dims, unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -833,7 +834,7 @@ ICMCompileMT_SCHEDULER_Self_END (int sched_id, char *first_task, char *ts_name,
void
ICMCompileMT_SCHEDULER_Self_INIT (int sched_id, char *first_task, char *ts_name,
int ts_dims, int ts_arg_num, char **ts_args, int dim,
int ts_dims, unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -913,7 +914,7 @@ ICMCompileMT_SCHEDULER_Self_INIT (int sched_id, char *first_task, char *ts_name,
void
ICMCompileMT_SCHEDULER_Affinity_BEGIN (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -949,7 +950,7 @@ ICMCompileMT_SCHEDULER_Affinity_BEGIN (int sched_id, char *ts_name, int ts_dims,
void
ICMCompileMT_SCHEDULER_Affinity_END (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......@@ -972,7 +973,7 @@ ICMCompileMT_SCHEDULER_Affinity_END (int sched_id, char *ts_name, int ts_dims,
void
ICMCompileMT_SCHEDULER_Affinity_INIT (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg)
{
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_sched.h
+ 9
- 9
View file @ 3637690e
......@@ -38,36 +38,36 @@ extern void ICMCompileMT_SCHEDULER_BlockVarDist_INIT (int sched_id, int dim,
char **vararg);
extern void ICMCompileMT_SCHEDULER_Static_BEGIN (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg);
extern void ICMCompileMT_SCHEDULER_Static_END (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg);
extern void ICMCompileMT_SCHEDULER_Static_INIT (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args, int dim,
unsigned int ts_arg_num, char **ts_args, int dim,
char **vararg);
extern void ICMCompileMT_SCHEDULER_Self_BEGIN (int sched_id, char *first_task,
char *ts_name, int ts_dims, int ts_arg_num,
char *ts_name, int ts_dims, unsigned int ts_arg_num,
char **ts_args, int dim, char **vararg);
extern void ICMCompileMT_SCHEDULER_Self_END (int sched_id, char *first_task,
char *ts_name, int ts_dims, int ts_arg_num,
char *ts_name, int ts_dims, unsigned int ts_arg_num,
char **ts_args, int dim, char **vararg);
extern void ICMCompileMT_SCHEDULER_Self_INIT (int sched_id, char *first_task,
char *ts_name, int ts_dims, int ts_arg_num,
char *ts_name, int ts_dims, unsigned int ts_arg_num,
char **ts_args, int dim, char **vararg);
extern void ICMCompileMT_SCHEDULER_Affinity_BEGIN (int sched_id, char *ts_name,
int ts_dims, int ts_arg_num,
int ts_dims, unsigned int ts_arg_num,
char **ts_args,
int dim, char **vararg);
extern void ICMCompileMT_SCHEDULER_Affinity_END (int sched_id, char *ts_name, int ts_dims,
int ts_arg_num, char **ts_args,
unsigned int ts_arg_num, char **ts_args,
int dim, char **vararg);
extern void ICMCompileMT_SCHEDULER_Affinity_INIT (int sched_id, char *ts_name,
int ts_dims, int ts_arg_num,
int ts_dims, unsigned int ts_arg_num,
char **ts_args,
int dim, char **vararg);
......
src/libsac2c/codegen/icm2c_std.c
+ 45
- 45
View file @ 3637690e
......@@ -27,7 +27,7 @@
#define SCAN_ARG_LIST(cnt, inc, sep_str, sep_code, code) \
do { \
for (int i = 0; i < cnt * inc; i += inc) { \
for (size_t i = 0; i < cnt * inc; i += inc) { \
if (i > 0) { \
out ("%s", sep_str); \
sep_code; \
......@@ -40,7 +40,7 @@
*
* function:
* void ICMCompileND_FUN_DECL( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -52,7 +52,7 @@
******************************************************************************/
void
ICMCompileND_FUN_DECL (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileND_FUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -85,7 +85,7 @@ ICMCompileND_FUN_DECL (char *name, char *rettype_NT, int vararg_cnt, char **vara
*
* function:
* void ICMCompileND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS ( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* Currently, this ICM only serves debugging purposes in the C code by showing which
......@@ -96,7 +96,7 @@ ICMCompileND_FUN_DECL (char *name, char *rettype_NT, int vararg_cnt, char **vara
void
ICMCompileND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS (char *name, char *rettype_NT,
int vararg_cnt, char **vararg)
unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -114,7 +114,7 @@ ICMCompileND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS (char *name, char *rettype_NT,
*
* function:
* void ICMCompileND_FUN_DEF_BEGIN( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -126,7 +126,7 @@ ICMCompileND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS (char *name, char *rettype_NT,
******************************************************************************/
void
ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -174,7 +174,7 @@ ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char *
*
* function:
* void ICMCompileND_FUN_DEF_END( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -188,7 +188,7 @@ ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt, char *
******************************************************************************/
void
ICMCompileND_FUN_DEF_END (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileND_FUN_DEF_END (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -207,14 +207,14 @@ ICMCompileND_FUN_DEF_END (char *name, char *rettype_NT, int vararg_cnt, char **v
/** <!--*********************************************************************-->
*
* @fn void ICMCompileMUTC_THREADFUN_DECL( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* @brief
*
******************************************************************************/
void
ICMCompileMUTC_THREADFUN_DECL (char *name, char *rettype_NT, int vararg_cnt,
ICMCompileMUTC_THREADFUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -240,7 +240,7 @@ ICMCompileMUTC_THREADFUN_DECL (char *name, char *rettype_NT, int vararg_cnt,
}
void
ICMCompileMUTC_THREADFUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
ICMCompileMUTC_THREADFUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -268,14 +268,14 @@ ICMCompileMUTC_THREADFUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt
/** <!--*********************************************************************-->
*
* @fn void ICMCompileMUTC_SPAWNFUN_DECL( char *name, char *rettype_NT,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* @brief
*
******************************************************************************/
void
ICMCompileMUTC_SPAWNFUN_DECL (char *name, char *rettype_NT, int vararg_cnt, char **vararg)
ICMCompileMUTC_SPAWNFUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -300,7 +300,7 @@ ICMCompileMUTC_SPAWNFUN_DECL (char *name, char *rettype_NT, int vararg_cnt, char
}
void
ICMCompileMUTC_SPAWNFUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
ICMCompileMUTC_SPAWNFUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -329,7 +329,7 @@ ICMCompileMUTC_SPAWNFUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
*
* function:
* void ICMCompileND_FUN_AP( char *name, char *retname,
* int vararg_cnt, char **vararg)
* unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -341,7 +341,7 @@ ICMCompileMUTC_SPAWNFUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
******************************************************************************/
void
ICMCompileND_FUN_AP (char *name, char *retname, int vararg_cnt, char **vararg)
ICMCompileND_FUN_AP (char *name, char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -397,7 +397,7 @@ DBUG_RETURN ();
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_CHECK( char *name, char
**retname, char *ret_NT, int vararg_cnt, char **vararg_NT, char **vararg)
**retname, char *ret_NT, unsigned int vararg_cnt, char **vararg_NT, char **vararg)
*
* description:
*
......@@ -411,7 +411,7 @@ DBUG_RETURN ();
static void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_CHECK (char *name, char *retname,
char *ret_NT, int vararg_cnt,
char *ret_NT, unsigned int vararg_cnt,
char **vararg_NT,
char **vararg)
{
......@@ -435,7 +435,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_CHECK (char *name, char *r
}
/* Raise compile time warning if there is a hidden out argument. */
for (int i = 0; i < vararg_cnt * 3; i += 3) {
for (unsigned int i = 0; i < vararg_cnt * 3; i += 3) {
#define SEPargtag
#define SELECTtextoutinout(it_text, it_out, it_inout) \
if (STReq (it_text, vararg[i]) && it_out \
......@@ -460,7 +460,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_CHECK (char *name, char *r
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_INIT( char *name, char
**retname, char *ret_NT, int vararg_cnt, char **vararg_NT, char **vararg)
**retname, char *ret_NT, unsigned int vararg_cnt, char **vararg_NT, char **vararg)
*
* description:
*
......@@ -472,7 +472,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_CHECK (char *name, char *r
static void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_INIT (char *name, char *retname,
char *ret_NT, int vararg_cnt,
char *ret_NT, unsigned int vararg_cnt,
char **vararg_NT,
char **vararg)
{
......@@ -491,7 +491,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_INIT (char *name, char *re
* For now we assume that the out argument value is unique (and therefore only used by
* the master node) and initialize it to NULL at the worker nodes. Inout arguments
* should always be unique. We initialize them to NULL if they are hidden. */
for (int i = 0; i < vararg_cnt * 3; i += 3) {
for (unsigned int i = 0; i < vararg_cnt * 3; i += 3) {
#define SEPargtag
#define SELECTtextoutinout(it_text, it_out, it_inout) \
if (STReq (it_text, vararg[i]) && (it_out || it_inout) \
......@@ -507,7 +507,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_INIT (char *name, char *re
/******************************************************************************
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC( int vararg_cnt, char
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC( unsigned int vararg_cnt, char
***vararg_NT, char **vararg)
*
* description:
......@@ -521,7 +521,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_HID_UNQ_INIT (char *name, char *re
******************************************************************************/
static void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC (int vararg_cnt, char **vararg_NT,
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC (unsigned int vararg_cnt, char **vararg_NT,
char **vararg)
{
DBUG_ENTER ();
......@@ -532,7 +532,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC (int vararg_cnt, char **vara
* the same order. By increasing the reference counter before the function
* application, we prevent that the variable is freed within the function.
*/
for (int i = 0; i < vararg_cnt * 3; i += 3) {
for (unsigned int i = 0; i < vararg_cnt * 3; i += 3) {
#define SEPargtag
#define SELECTtextin(it_text, it_in) \
if (STReq (it_text, vararg[i]) && it_in \
......@@ -557,7 +557,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC (int vararg_cnt, char **vara
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST( char *retname, char
**rettype, char *ret_NT, int vararg_cnt, char **vararg_NT, char **vararg, char
**rettype, char *ret_NT, unsigned int vararg_cnt, char **vararg_NT, char **vararg, char
**broadcast_operation)
*
* description:
......@@ -569,7 +569,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_INCRC (int vararg_cnt, char **vara
static void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST (char *retname, char *rettype,
char *ret_NT, int vararg_cnt,
char *ret_NT, unsigned int vararg_cnt,
char **vararg_NT, char **vararg,
char *broadcast_operation)
{
......@@ -588,7 +588,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST (char *retname, char *re
rettype, ret_NT);
}
for (int i = 0; i < vararg_cnt * 3; i += 3) {
for (unsigned int i = 0; i < vararg_cnt * 3; i += 3) {
/*
* Create code for broadcast operations for non-hidden out and in-out arguments.
* Inout arguments should always be unique but for the time being we broadcast them
......@@ -631,7 +631,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST (char *retname, char *re
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST_BARRIER( char *retname,
*char *ret_NT, int vararg_cnt, char **vararg_NT, char **vararg)
*char *ret_NT, unsigned int vararg_cnt, char **vararg_NT, char **vararg)
*
* description:
* Creates code for a barrier operation to be used between broadcast operations for
......@@ -642,7 +642,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST (char *retname, char *re
static void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST_BARRIER (
char *retname, char *ret_NT, int vararg_cnt, char **vararg_NT, char **vararg)
char *retname, char *ret_NT, unsigned int vararg_cnt, char **vararg_NT, char **vararg)
{
DBUG_ENTER ();
......@@ -654,7 +654,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST_BARRIER (
}
if (!do_barrier) {
for (int i = 0; i < vararg_cnt * 3; i += 3) {
for (unsigned int i = 0; i < vararg_cnt * 3; i += 3) {
/* Check whether there was a broadcast operation for a non-hidden out or inout argument.
*/
#define SEPargtag
......@@ -690,7 +690,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST_BARRIER (
*
* function:
* void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS( int vararg_NT_cnt, char
***vararg_NT, char *rettype, char *ret_NT, char *name, char *retname, int vararg_cnt,
***vararg_NT, char *rettype, char *ret_NT, char *name, char *retname, unsigned int vararg_cnt,
*char **vararg)
*
* description:
......@@ -705,9 +705,9 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS_BROADCAST_BARRIER (
******************************************************************************/
void
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (int vararg_NT_cnt, char **vararg_NT,
ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (unsigned int vararg_NT_cnt, char **vararg_NT,
char *rettype, char *ret_NT, char *name,
char *retname, int vararg_cnt,
char *retname, unsigned int vararg_cnt,
char **vararg)
{
DBUG_ENTER ();
......@@ -881,7 +881,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (int vararg_NT_cnt, char **vararg_
* function:
* void ICMCompileMUTC_THREADFUN_AP( char *name,
* char *retname,
* int vararg_cnt,
* unsigned int vararg_cnt,
* char **vararg)
*
* description:
......@@ -894,7 +894,7 @@ ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (int vararg_NT_cnt, char **vararg_
******************************************************************************/
void
ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, int vararg_cnt, char **vararg)
ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -918,7 +918,7 @@ ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, int vararg_cnt, char **v
* function:
* void ICMCompileMUTC_FUNTHREADFUN_AP( char *name,
* char *retname,
* int vararg_cnt,
* unsigned int vararg_cnt,
* char **vararg)
*
* description:
......@@ -931,7 +931,7 @@ ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, int vararg_cnt, char **v
******************************************************************************/
void
ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, int vararg_cnt, char **vararg)
ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -957,7 +957,7 @@ ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, int vararg_cnt, char
* char *place,
* char *name,
* char *retname,
* int vararg_cnt,
* unsigned int vararg_cnt,
* char **vararg)
*
* description:
......@@ -972,7 +972,7 @@ ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, int vararg_cnt, char
void
ICMCompileMUTC_SPAWNFUN_AP (char *var_NT, char *place, char *name, char *retname,
int vararg_cnt, char **vararg)
unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -993,7 +993,7 @@ ICMCompileMUTC_SPAWNFUN_AP (char *var_NT, char *place, char *name, char *retname
/******************************************************************************
*
* function:
* void ICMCompileND_FUN_RET( char *retname, int vararg_cnt, char **vararg)
* void ICMCompileND_FUN_RET( char *retname, unsigned int vararg_cnt, char **vararg)
*
* description:
* implements the compilation of the following ICM:
......@@ -1005,7 +1005,7 @@ ICMCompileMUTC_SPAWNFUN_AP (char *var_NT, char *place, char *name, char *retname
******************************************************************************/
void
ICMCompileND_FUN_RET (char *retname, int vararg_cnt, char **vararg)
ICMCompileND_FUN_RET (char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......@@ -1035,7 +1035,7 @@ ICMCompileND_FUN_RET (char *retname, int vararg_cnt, char **vararg)
*
* function:
* void ICMCompileMUTC_THREADFUN_RET( char *retname,
* int vararg_cnt,
* unsigned int vararg_cnt,
* char **vararg)
*
* description:
......@@ -1048,7 +1048,7 @@ ICMCompileND_FUN_RET (char *retname, int vararg_cnt, char **vararg)
*****************************************************************************/
void
ICMCompileMUTC_THREADFUN_RET (char *retname, int vararg_cnt, char **vararg)
ICMCompileMUTC_THREADFUN_RET (char *retname, unsigned int vararg_cnt, char **vararg)
{
DBUG_ENTER ();
......
src/libsac2c/codegen/icm2c_std.h
+ 16
- 16
View file @ 3637690e
#ifndef _SAC_ICM2C_STD_H_
#define _SAC_ICM2C_STD_H_
extern void ICMCompileND_FUN_DECL (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileND_FUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileND_DISTMEM_FUN_DECL_WITH_SIDE_EFFECTS (char *name, char *rettype_NT,
int vararg_cnt,
unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileND_FUN_DEF_BEGIN (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileND_FUN_DEF_END (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileND_FUN_DEF_END (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMUTC_THREADFUN_DECL (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileMUTC_THREADFUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMUTC_SPAWNFUN_DECL (char *name, char *rettype_NT, int vararg_cnt,
extern void ICMCompileMUTC_SPAWNFUN_DECL (char *name, char *rettype_NT, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMUTC_THREADFUN_DEF_BEGIN (char *name, char *rettype_NT,
int vararg_cnt, char **vararg);
unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_SPAWNFUN_DEF_BEGIN (char *name, char *rettype_NT,
int vararg_cnt, char **vararg);
extern void ICMCompileND_FUN_AP (char *name, char *retname, int vararg_cnt,
unsigned int vararg_cnt, char **vararg);
extern void ICMCompileND_FUN_AP (char *name, char *retname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (int vararg_NT_cnt,
extern void ICMCompileND_DISTMEM_FUN_AP_WITH_SIDE_EFFECTS (unsigned int vararg_NT_cnt,
char **vararg_NT,
char *rettype, char *ret_NT,
char *name, char *retname,
int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, int vararg_cnt,
unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_THREADFUN_AP (char *name, char *retname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileMUTC_SPAWNFUN_AP (char *syncid, char *place, char *name,
char *retname, int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, int vararg_cnt,
char *retname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_FUNTHREADFUN_AP (char *name, char *retname, unsigned int vararg_cnt,
char **vararg);
extern void ICMCompileND_FUN_RET (char *retname, int vararg_cnt, char **vararg);
extern void ICMCompileND_FUN_RET (char *retname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_THREADFUN_RET (char *retname, int vararg_cnt, char **vararg);
extern void ICMCompileMUTC_THREADFUN_RET (char *retname, unsigned int vararg_cnt, char **vararg);
extern void ICMCompileND_OBJDEF (char *var_NT, char *basetype, int sdim, int *shp);
......
src/libsac2c/codegen/icm_betest.c
+ 9
- 4
View file @ 3637690e
......@@ -35,13 +35,17 @@
scanf ("%i", &name); \
DBUG_PRINT ("BEtest", ("int-arg: %i\n", name));
#define ICM_UINT(name) \
scanf ("%u", &name); \
DBUG_PRINT ("BEtest", ("sizet-arg: %u\n", name));
#define ICM_BOOL(name) \
scanf ("%i", &name); \
DBUG_PRINT ("BEtest", ("bool-arg: %i\n", name));
#define ICM_VARANY(dim, name) \
{ \
int i; \
size_t i; \
name = (char **)malloc (dim * sizeof (char *)); \
DBUG_PRINT ("BEtest", ("varany-arg with %d elems:\n", dim)); \
for (i = 0; i < dim; i++) { \
......@@ -51,7 +55,7 @@
#define ICM_VARNT(dim, name) \
{ \
int i; \
size_t i; \
name = (char **)malloc (dim * sizeof (char *)); \
DBUG_PRINT ("BEtest", ("varnt-arg with %d elems:\n", dim)); \
for (i = 0; i < dim; i++) { \
......@@ -61,7 +65,7 @@
#define ICM_VARID(dim, name) \
{ \
int i; \
size_t i; \
name = (char **)malloc (dim * sizeof (char *)); \
DBUG_PRINT ("BEtest", ("varid-arg with %d elems:\n", dim)); \
for (i = 0; i < dim; i++) { \
......@@ -71,7 +75,7 @@
#define ICM_VARINT(dim, varint) \
{ \
int i; \
size_t i; \
varint = (int *)malloc (dim * sizeof (int)); \
DBUG_PRINT ("BEtest", ("varint-arg with %d elems:\n", dim)); \
for (i = 0; i < dim; i++) { \
......@@ -95,6 +99,7 @@
#undef ICM_ID
#undef ICM_STR
#undef ICM_INT
#undef ICM_UINT
#undef ICM_BOOL
#undef ICM_VARANY
#undef ICM_VARNT
......
src/libsac2c/codegen/icm_comment.c
+ 10
- 4
View file @ 3637690e
......@@ -29,6 +29,11 @@
fprintf (global.outfile, "%d", name); \
sep = 1;
#define ICM_UINT(name) \
SEP; \
fprintf (global.outfile, "%u", name); \
sep = 1;
#define ICM_BOOL(name) ICM_INT (name)
/* dim and i needs to be signed due to function in tree_compound.c
......@@ -37,7 +42,7 @@
*/
#define ICM_VARANY(dim, name) \
{ \
int i; \
size_t i; \
for (i = 0; i < dim; i++) { \
ICM_ANY (name[i]) \
} \
......@@ -45,7 +50,7 @@
#define ICM_VARNT(dim, name) \
{ \
int i; \
size_t i; \
for (i = 0; i < dim; i++) { \
ICM_NT (name[i]) \
} \
......@@ -53,7 +58,7 @@
#define ICM_VARID(dim, name) \
{ \
int i; \
size_t i; \
for (i = 0; i < dim; i++) { \
ICM_ID (name[i]) \
} \
......@@ -61,7 +66,7 @@
#define ICM_VARINT(dim, name) \
{ \
int i; \
size_t i; \
for (i = 0; i < dim; i++) { \
ICM_INT (name[i]) \
} \
......@@ -84,6 +89,7 @@
#undef ICM_ID
#undef ICM_STR
#undef ICM_INT
#undef ICM_UINT
#undef ICM_BOOL
#undef ICM_VARANY
#undef ICM_VARNT
......
src/libsac2c/codegen/icm_icm2c.c
+ 7
- 4
View file @ 3637690e
......@@ -29,26 +29,28 @@
#define ICM_INT(name) exprs = GetNextInt (&name, exprs);
#define ICM_UINT(name) exprs = GetNextUint(&name, exprs);
#define ICM_BOOL(name) exprs = GetNextBool (&name, exprs);
#define ICM_VARANY(cnt, name) \
if (cnt > 0) { \
exprs = GetNextVarAny (&name, NULL, cnt, exprs); \
exprs = GetNextVarAny (&name, NULL, cnt, exprs); \
}
#define ICM_VARNT(cnt, name) \
if (cnt > 0) { \
exprs = GetNextVarNt (&name, cnt, exprs); \
exprs = GetNextVarNt (&name, cnt, exprs); \
}
#define ICM_VARID(cnt, name) \
if (cnt > 0) { \
exprs = GetNextVarId (&name, cnt, exprs); \
exprs = GetNextVarId (&name, cnt, exprs); \
}
#define ICM_VARINT(cnt, name) \
if (cnt > 0) { \
exprs = GetNextVarInt (&name, cnt, exprs); \
exprs = GetNextVarInt (&name, cnt, exprs); \
}
#define ICM_END(prf, args) \
......@@ -838,6 +840,7 @@ GetNextVarInt (int **ret, size_t cnt, node *exprs)
#undef ICM_ID
#undef ICM_STR
#undef ICM_INT
#undef ICM_UINT
#undef ICM_BOOL
#undef ICM_VARANY
#undef ICM_VARNT
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment