mercurylang/mercury
1
0
Fork 0
mirror of https://github.com/Mercury-Language/mercury.git synced 2026-04-15 09:23:44 +00:00
Code Issues Projects Releases Wiki Activity

Eliminate hlc_nest and hl_nest grades ...

Browse Source 
... by eliminating the grade component that calls for the use of gcc nested
functions.

runtime/mercury_grade.h:
compiler/compute_grade.m:
    Delete the gcc_nested_functions grade component, and the C macro
    that specifies its presence, MR_USE_GCC_NESTED_FUNCTIONS.

scripts/canonical_grade.sh-subr:
scripts/init_grade_options.sh-subr:
scripts/mgnuc.in:
scripts/parse_grade_options.sh-subr:
    Delete the code that parses the deleted grade component,
    and delete the code that signals its absence in other grades.

compiler/options.m:
    Delete the gcc_nested_functions grade option.

    Delete also the gcc_local_labels option, since it was useful
    only if gcc_nested_functions was set.

configure.ac:
    Delete the code that sometimes added hl*_nest grades to the list of grades
    to be installed.

    Fix a bunch of comments.

compiler/compile_target_code.m:
compiler/handle_options.m:
compiler/mercury_compile_mlds_back_end.m:
compiler/ml_args_util.m:
compiler/ml_call_gen.m:
compiler/ml_code_util.m:
compiler/ml_commit_gen.m:
compiler/ml_gen_info.m:
compiler/mlds_to_c.m:
library/backjump.m:
library/exception.m:
runtime/mercury_hlc_types.h:
runtime/mercury_tabling.c:
runtime/mercury_tabling.h:
    Delete code that was active only in grades with the deleted grade
    component.

compiler/ml_accurate_gc.m:
compiler/notes/grade_library.html:
runtime/mercury_conf_param.h:
    Delete mentions of the deleted grade component.

compiler/ml_code_gen.m:
    Delete mentions of the deleted grade component, and a bunch of other
    obsolete comments.

doc/user_guide.texi:
    Fix a line break.
This commit is contained in:
Zoltan Somogyi
2017-09-07 03:01:55 +10:00
parent b2b2aad2e6
commit f4e0059a49
27 changed files with 223 additions and 710 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/canonical_grade.sh-subr
View File

@@ -38,7 +38,7 @@ case $asm_labels in
esac
case $highlevel_code,$highlevel_data,$GRADE,$target in
true,true,none,*)
true,true,none,*)
case $target in
c|asm) GRADE="hl" ;;
csharp) GRADE="csharp" ;;
@@ -51,7 +51,7 @@ case $highlevel_code,$highlevel_data,$GRADE,$target in
;;
esac
;;
true,false,none,*)
true,false,none,*)
case $target in
c|asm) GRADE="hlc" ;;
*)
@@ -76,11 +76,6 @@ case $highlevel_code,$highlevel_data,$GRADE,$target in
;;
esac
case $gcc_nested_functions,$highlevel_code in
true,true) GRADE="${GRADE}_nest" ;;
*) ;;
esac
case $thread_safe,$threadscope in
true,false) GRADE="$GRADE.par" ;;
true,true) GRADE="$GRADE.par.threadscope" ;;

2
scripts/init_grade_options.sh-subr
View File

@@ -56,7 +56,6 @@ Grade options:
See the documentation in the \"Invocation\" section
of the Mercury User's Guide."
# --gcc-nested-functions is not yet documented because it is not yet stable
# --high-level-data is not yet documented because it is not yet implemented
# --high-level is not yet documented because --high-level-data is
# not yet implemented
@@ -66,7 +65,6 @@ Grade options:
target=c
highlevel_code=false
highlevel_data=false
gcc_nested_functions=false
asm_labels=true
non_local_gotos=true
global_regs=true

5
scripts/mgnuc.in
View File

@@ -275,11 +275,6 @@ case $highlevel_data in
false) HLD_OPTS="" ;;
esac
case $gcc_nested_functions in
true) NEST_OPTS="-DMR_USE_GCC_NESTED_FUNCTIONS" ;;
false) NEST_OPTS="" ;;
esac
case $asm_labels in
true) ASM_OPTS="-DMR_USE_ASM_LABELS" ;;
false) ASM_OPTS="" ;;

33
scripts/parse_grade_options.sh-subr
View File

@@ -58,11 +58,6 @@
--no-high-level-data)
highlevel_data=false ;;
--gcc-nested-functions)
gcc_nested_functions=true ;;
--no-gcc-nested-functions)
gcc_nested_functions=false ;;
--asm-labels)
asm_labels=true ;;
--no-asm-labels)
@@ -235,7 +230,6 @@
target=c
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
asm_labels=false
non_local_gotos=false
@@ -275,7 +269,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=false
highlevel_data=true
;;
java)
@@ -284,7 +277,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=false
highlevel_data=true
;;
erlang)
@@ -293,7 +285,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=false
highlevel_data=true
;;
hl)
@@ -301,7 +292,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=false
highlevel_data=true
;;
hlc)
@@ -309,23 +299,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=false
highlevel_data=false
;;
hl_nest)
asm_labels=false
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=true
highlevel_data=true
;;
hlc_nest)
asm_labels=false
non_local_gotos=false
global_regs=false
highlevel_code=true
gcc_nested_functions=true
highlevel_data=false
;;
asm_fast)
@@ -334,7 +307,6 @@
non_local_gotos=true
global_regs=true
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;
asm_jump)
@@ -343,7 +315,6 @@
non_local_gotos=true
global_regs=false
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;
fast)
@@ -352,7 +323,6 @@
non_local_gotos=true
global_regs=true
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;
jump)
@@ -361,7 +331,6 @@
non_local_gotos=true
global_regs=false
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;
reg)
@@ -370,7 +339,6 @@
non_local_gotos=false
global_regs=true
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;
none)
@@ -379,7 +347,6 @@
non_local_gotos=false
global_regs=false
highlevel_code=false
gcc_nested_functions=false
highlevel_data=false
;;