Index: control/make/make_cmd.sh
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/control/make/make_cmd.sh,v
retrieving revision 1.3
diff -r1.3 make_cmd.sh
19a20
> #ALT_OUTPUTDIR=/p/multifacet/projects/nobackup1/a/jvm_compiled_1.4.1 \
27c28
< ALT_OUTPUTDIR=/p/multifacet/projects/nobackup1/a/jvm_compiled_1.4.1 \
---
> ALT_OUTPUTDIR=/mnt/java/jvm_compiled_1.4.1 \
32c33
< ENFORCE_COMPILER_REV=5.3 \
---
> ENFORCE_COMPILER_REV=5.4 \
35c36
< ALT_ODBCDIR=/p/multifacet/projects/ecperf/java_src_1.4.1/odbc
---
> ALT_ODBCDIR=/p/multifacet/projects/java_locks/java_src_1.4.1/odbc
Index: hotspot/build/solaris/makefiles/adlc.make
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/build/solaris/makefiles/adlc.make,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 adlc.make
13a14,15
> test garbage =+= anything junk
> 
171c173
< 	@echo Compiling $<
---
> 	@echo Compiling_adlc_top $<
178c180
< 	@echo Compiling $<
---
> 	@echo Compiling_adlc_bot $<
Index: hotspot/build/solaris/makefiles/rules.make
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/build/solaris/makefiles/rules.make,v
retrieving revision 1.1.1.1
diff -r1.1.1.1 rules.make
9c9
< 
---
> #include $(GAMMADIR)/build/solaris/makefiles/adlc.make
51a52,67
> 
> # KM - begin mods
> ADLCFLAGS = -q -T
> 
> ifdef LP64
> ADLCFLAGS += -D_LP64
> else
> ADLCFLAGS += -U_LP64
> endif
> 
> ifeq ("${Platform_arch}", "sparc")
> ADLCFLAGS += -DLONGS_IN_ONE_ENTRY
> endif
> # KM -end mods
> 
> 
56a73
> # KM added adlc flags below
58c75
< 	@echo Compiling $<
---
> 	@echo Compiling_rules $<
60c77
< 	$(QUIETLY) $(COMPILE.CC) -o $@ $< $(COMPILE_DONE)
---
> 	$(QUIETLY) $(COMPILE.CC) $(ADLCFLAGS) -o $@ $< $(COMPILE_DONE)
Index: hotspot/build/solaris/makefiles/vm.make
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/build/solaris/makefiles/vm.make,v
retrieving revision 1.3
diff -r1.3 vm.make
55c55
< # MODIFIED KM -- 3/12
---
> # MODIFIED KM -- 3/12, 2/13/04 (Change This!)
57c57
< LIBS += -L/p/multifacet/projects/ecperf/nuca_locks/src/ -R/p/multifacet/projects/ecperf/nuca_locks/src/ -lparmacs_locks -ldl -staticlib=Crun -lCrun -lthread -lsocket -lnsl -lm
---
> #LIBS += -L/p/multifacet/projects/java_locks/nuca_locks/src/ -R/p/multifacet/projects/ecperf/nuca_locks/src/ -lparmacs_locks -ldl -staticlib=Crun -lCrun -lthread -lsocket -lnsl -lm
58a59,60
> # KM -- use this for simics:
> LIBS += -L/mnt/java/ -R/mnt/java/ -lparmacs_locks -ldl -staticlib=Crun -lCrun -lthread -lsocket -lnsl -lm
Index: hotspot/src/os/solaris/vm/os_solaris.cpp
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/src/os/solaris/vm/os_solaris.cpp,v
retrieving revision 1.3
diff -r1.3 os_solaris.cpp
2587a2588,2625
>   else if(UseProfileLocks){
>     printf("Using Lock Profiling\n");
>     os::Solaris::set_mutex_lock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("profile_mutex_lock")));
>     os::Solaris::set_mutex_trylock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("profile_mutex_trylock")));
>     os::Solaris::set_mutex_unlock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("profile_mutex_unlock")));
>     os::Solaris::set_mutex_init(lwp_mutex_init);
>     os::Solaris::set_mutex_destroy(lwp_mutex_destroy);
>     os::Solaris::set_mutex_scope(USYNC_PROCESS);
>     
>     os::Solaris::set_cond_timedwait(CAST_TO_FN_PTR(int_fnP_cond_tP_mutex_tP_timestruc_tP, resolve_symbol("_lwp_cond_timedwait")));
>     os::Solaris::set_cond_wait(CAST_TO_FN_PTR(int_fnP_cond_tP_mutex_tP, resolve_symbol("_lwp_cond_wait")));
>     os::Solaris::set_cond_signal(CAST_TO_FN_PTR(int_fnP_cond_tP, resolve_symbol("_lwp_cond_signal")));
>     os::Solaris::set_cond_broadcast(CAST_TO_FN_PTR(int_fnP_cond_tP, resolve_symbol("_lwp_cond_broadcast")));
>     os::Solaris::set_cond_init(lwp_cond_init);        
>     os::Solaris::set_cond_destroy(lwp_cond_destroy);        
>     os::Solaris::set_cond_scope(USYNC_PROCESS);
>   }
>   else if(UseTransMem){
>     printf("Using Transactional Memory\n");
>     os::Solaris::set_mutex_lock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("transactional_mutex_lock")));
>     //fprintf(stderr, "done setting 'lock'\n");
>     os::Solaris::set_mutex_trylock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("transactional_mutex_trylock")));
>     //fprintf(stderr, "done setting 'trylock'\n");
>     os::Solaris::set_mutex_unlock(CAST_TO_FN_PTR(int_fnP_mutex_tP, resolve_symbol("transactional_mutex_unlock")));
>     //fprintf(stderr, "done setting 'unlock'\n");
>     os::Solaris::set_mutex_init(lwp_mutex_init);
>     os::Solaris::set_mutex_destroy(lwp_mutex_destroy);
>     os::Solaris::set_mutex_scope(USYNC_PROCESS);
>     
>     os::Solaris::set_cond_timedwait(CAST_TO_FN_PTR(int_fnP_cond_tP_mutex_tP_timestruc_tP, resolve_symbol("_lwp_cond_timedwait")));
>     os::Solaris::set_cond_wait(CAST_TO_FN_PTR(int_fnP_cond_tP_mutex_tP, resolve_symbol("_lwp_cond_wait")));
>     os::Solaris::set_cond_signal(CAST_TO_FN_PTR(int_fnP_cond_tP, resolve_symbol("_lwp_cond_signal")));
>     os::Solaris::set_cond_broadcast(CAST_TO_FN_PTR(int_fnP_cond_tP, resolve_symbol("_lwp_cond_broadcast")));
>     os::Solaris::set_cond_init(lwp_cond_init);        
>     os::Solaris::set_cond_destroy(lwp_cond_destroy);        
>     os::Solaris::set_cond_scope(USYNC_PROCESS);
>     printf("Done with function pointer init\n");
>   }
Index: hotspot/src/share/vm/runtime/arguments.cpp
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/src/share/vm/runtime/arguments.cpp,v
retrieving revision 1.2
diff -r1.2 arguments.cpp
1335a1336,1338
>       // Lock Profiling
>     } else if (match_option(option, "-XX:UseProfileLocks", &tail)) {
>       UseProfileLocks = true;
1341a1345,1347
>       // Transactional Memory,
>     } else if (match_option(option, "-XX:UseTransMem", &tail)) {
>       UseTransMem = true;
Index: hotspot/src/share/vm/runtime/globals.hpp
===================================================================
RCS file: /p/multifacet/cvsroot/java_src_1.4.1/hotspot/src/share/vm/runtime/globals.hpp,v
retrieving revision 1.2
diff -r1.2 globals.hpp
524a525,528
>   product(bool, UseProfileLocks, false,                                     \
>           "Turn on Lock profiling in Simics "                               \
>           "(Solaris only)")                                                 \
>                                                                             \
530a535,538
>           "(Solaris only)")                                                 \
>                                                                             \
>   product(bool, UseTransMem, false,                                         \
>           "Use transactional memory instead of lock-based lwp methods "     \