looks like you need to rebase onto latest tree - drop the cmd_list.h hunk - see the attached patch
building on 64bit systems still produces ugly warnings. looking at the code, it seems to assume that the size of pointers are 32bit, and that's just broken. not sure how you'll want to fix. in jamsym.h, the value member could probably be patched to "mostly" work by changing the type from uint32_t to unsigned long. CC jamexec.lo jamexec.c: In function 'jam_get_array_subrange': jamexec.c:742:17: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_convert_literal_binary': jamexec.c:869:31: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c: In function 'jam_convert_literal_array': jamexec.c:1002:31: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c: In function 'jam_get_array_argument': jamexec.c:1494:43: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_call_procedure': jamexec.c:2081:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_call_procedure_from_procedure': jamexec.c:2312:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_boolean': jamexec.c:2677:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c:2698:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c: In function 'jam_process_drscan_compare': jamexec.c:3138:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:3238:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:3307:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_drscan_capture': jamexec.c:3497:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_drscan': jamexec.c:3640:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_export': jamexec.c:4001:54: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_integer': jamexec.c:4669:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c:4687:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c: In function 'jam_process_irscan_compare': jamexec.c:4850:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:4919:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_irscan_capture': jamexec.c:5096:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_irscan': jamexec.c:5239:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_assignment': jamexec.c:5656:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:5819:51: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_pop': jamexec.c:6335:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_pre_post': jamexec.c:6597:29: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_procedure': jamexec.c:7007:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c:7014:35: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_vector_capture': jamexec.c:7432:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_vector_compare': jamexec.c:7548:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:7617:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_process_vector': jamexec.c:7799:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c:7856:27: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexec.c: In function 'jam_execute': jamexec.c:8594:33: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamexec.c:8596:36: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] CC jamnote.lo CC jamcrc.lo CC jamsym.lo jamsym.c: In function 'jam_init_symbol_table': jamsym.c:74:40: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamsym.c:74:29: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamsym.c: In function 'jam_add_symbol': jamsym.c:394:19: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamsym.c:398:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamsym.c:398:42: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamsym.c: In function 'jam_get_symbol_record': jamsym.c:544:31: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] CC jamstack.lo CC jamheap.lo jamheap.c: In function 'jam_init_heap': jamheap.c:74:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c:75:38: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c: In function 'jam_add_heap_record': jamheap.c:184:38: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c:184:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamheap.c:188:17: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c:188:42: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c: In function 'jam_get_temp_workspace': jamheap.c:277:14: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] jamheap.c:277:48: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] CC jamarray.lo jamarray.c: In function 'jam_get_array_value': jamarray.c:2000:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] CC jamcomp.lo CC jamjtag.lo CC jamutil.lo CC jamexp.lo jamexp.c: In function 'jam_exp_eval': jamexp.c:895:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexp.c:945:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexp.c:964:26: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexp.c:970:28: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] jamexp.c: In function 'jam_yylex': jamexp.c:1406:23: warning: cast from pointer to integer of different size [-Wpointer-to-int-cast] CC stapl.lo stapl.c: In function 'jam_jtag_io_transfer': stapl.c:267:9: warning: variable 'tdo_bit' set but not used [-Wunused-but-set-variable] CCLD libstapl.la -mike
diff --git a/urjtag/configure.ac b/urjtag/configure.ac index 003cb08..63b218b 100644 --- a/urjtag/configure.ac +++ b/urjtag/configure.ac @@ -80,7 +80,7 @@ AC_CONFIG_FILES( src/cmd/Makefile src/svf/Makefile src/bsdl/Makefile - src/stapl/Makefile + src/stapl/Makefile src/jim/Makefile src/pld/Makefile src/global/Makefile @@ -761,17 +761,18 @@ AC_MSG_NOTICE([ urjtag is now configured for Libraries: - libusb : $FLAG_HAVELIBUSB - libftdi : $FLAG_HAVELIBFTDI $FLAG_HAVELIBFTDI_ASYNCMODE - libftd2xx : $FLAG_HAVELIBFTD2XX - inpout32 : $FLAG_HAVE_INPOUTXX + libusb : $FLAG_HAVELIBUSB + libftdi : $FLAG_HAVELIBFTDI $FLAG_HAVELIBFTDI_ASYNCMODE + libftd2xx : $FLAG_HAVELIBFTD2XX + inpout32 : $FLAG_HAVE_INPOUTXX Subsystems: - SVF player : $FLAG_svf - BSDL : $FLAG_bsdl + SVF player : $FLAG_svf + STAPL player : $FLAG_stapl + BSDL : $FLAG_bsdl Drivers: - Bus : $enabled_bus_drivers - Cable : $enabled_cable_drivers - Lowlevel : $enabled_lowlevel_drivers + Bus : $enabled_bus_drivers + Cable : $enabled_cable_drivers + Lowlevel : $enabled_lowlevel_drivers ]) diff --git a/urjtag/src/Makefile.am b/urjtag/src/Makefile.am index 166ca3c..257f2ce 100644 --- a/urjtag/src/Makefile.am +++ b/urjtag/src/Makefile.am @@ -46,6 +46,10 @@ if ENABLE_JIM SUBDIRS += jim endif +if ENABLE_STAPL +SUBDIRS += stapl +endif + pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = urjtag.pc @@ -84,6 +88,10 @@ if ENABLE_JIM liburjtag_la_LIBADD += jim/libjim.la endif +if ENABLE_STAPL +liburjtag_la_LIBADD += stapl/libstapl.la +endif + localedir = $(datadir)/locale INCLUDES = -DLOCALEDIR=\"$(localedir)\" diff --git a/urjtag/src/cmd/Makefile.am b/urjtag/src/cmd/Makefile.am index b1a8cb5..5213d78 100644 --- a/urjtag/src/cmd/Makefile.am +++ b/urjtag/src/cmd/Makefile.am @@ -74,6 +74,10 @@ if ENABLE_BSDL all_cmd_files += cmd_bsdl.c endif +if ENABLE_STAPL +all_cmd_files += cmd_stapl.c +endif + libcmd_la_SOURCES = \ cmd.h \ cmd_list.h \ diff --git a/urjtag/src/stapl/Makefile.am b/urjtag/src/stapl/Makefile.am index 1fac7d9..002a25e 100644 --- a/urjtag/src/stapl/Makefile.am +++ b/urjtag/src/stapl/Makefile.am @@ -21,37 +21,34 @@ include $(top_srcdir)/Makefile.rules -AM_YFLAGS = -d - -OBJEXT = lo noinst_LTLIBRARIES = \ - libstapl.la + libstapl.la libstapl_la_SOURCES = \ - jamexec.c \ - jamnote.c \ - jamcrc.c \ - jamsym.c \ - jamstack.c \ - jamheap.c \ - jamarray.c \ - jamcomp.c \ - jamjtag.c \ - jamutil.c \ - jamexp.c \ - jamexec.h \ - jamnote.h \ - jamcrc.h \ - jamsym.h \ - jamstack.h \ - jamheap.h \ - jamarray.h \ - jamcomp.h \ - jamjtag.h \ - jamutil.h \ - jamexp.h \ - stapl.h \ - stapl.c + jamexec.c \ + jamnote.c \ + jamcrc.c \ + jamsym.c \ + jamstack.c \ + jamheap.c \ + jamarray.c \ + jamcomp.c \ + jamjtag.c \ + jamutil.c \ + jamexp.c \ + jamexec.h \ + jamnote.h \ + jamcrc.h \ + jamsym.h \ + jamstack.h \ + jamheap.h \ + jamarray.h \ + jamcomp.h \ + jamjtag.h \ + jamutil.h \ + jamexp.h \ + stapl.h \ + stapl.c AM_CFLAGS = $(WARNINGCFLAGS)
signature.asc
Description: This is a digitally signed message part.
------------------------------------------------------------------------------ All of the data generated in your IT infrastructure is seriously valuable. Why? It contains a definitive record of application performance, security threats, fraudulent activity, and more. Splunk takes this data and makes sense of it. IT sense. And common sense. http://p.sf.net/sfu/splunk-d2d-c2
_______________________________________________ UrJTAG-development mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/urjtag-development
