[Pdbg] [PATCH 29/29] pdbg/htm: Remove deprecated commands and code

[Alistair Popple]

I doubt many people use them but I would rather not break things that previously
worked without providing some hints on what to do.

Would it be possible to replace all the htm_* commands to callback a function
which will just print updated usage information? (ie. if your seeing this
message use `htm nest status` instead). Thanks.

- Alistair

On Friday, 9 February 2018 3:38:57 PM AEDT Cyril Bur wrote:
> Signed-off-by: Cyril Bur <cyrilbur at gmail.com>
> ---
>  src/htm.c  | 40 ----------------------------------------
>  src/htm.h  |  8 --------
>  src/main.c |  7 -------
>  3 files changed, 55 deletions(-)
> 
> diff --git a/src/htm.c b/src/htm.c
> index e5db0e2..d71d7ea 100644
> --- a/src/htm.c
> +++ b/src/htm.c
> @@ -302,43 +302,3 @@ int run_htm(int optind, int argc, char *argv[])
>  
>  	return rc;
>  }
> -
> -/*
> - * These are all the old handlers that only worked with nest HTM.
> - * I don't want to break the commands but we've gone with a more
> - * flexible HTM command structure to better incorporate core HTM.
> - */
> -int run_htm_start(int optind, int argc, char *argv[])
> -{
> -	return run_start(HTM_NEST, optind, argc, argv);
> -}
> -
> -int run_htm_stop(int optind, int argc, char *argv[])
> -{
> -	return run_stop(HTM_NEST, optind, argc, argv);
> -}
> -
> -int run_htm_status(int optind, int argc, char *argv[])
> -{
> -	return run_status(HTM_NEST, optind, argc, argv);
> -}
> -
> -int run_htm_reset(int optind, int argc, char *argv[])
> -{
> -	return run_reset(HTM_NEST, optind, argc, argv);
> -}
> -
> -int run_htm_dump(int optind, int argc, char *argv[])
> -{
> -	return run_dump(HTM_NEST, optind, argc, argv);;
> -}
> -
> -int run_htm_trace(int optind, int argc, char *argv[])
> -{
> -	return run_trace(HTM_NEST, optind, argc, argv);
> -}
> -
> -int run_htm_analyse(int optind, int argc, char *argv[])
> -{
> -	return run_analyse(HTM_NEST, optind, argc, argv);
> -}
> diff --git a/src/htm.h b/src/htm.h
> index fef569e..29a5387 100644
> --- a/src/htm.h
> +++ b/src/htm.h
> @@ -18,12 +18,4 @@
>  
>  #include <target.h>
>  
> -int run_htm_start(int optind, int argc, char *argv[]);
> -int run_htm_stop(int optind, int argc, char *argv[]);
> -int run_htm_status(int optind, int argc, char *argv[]);
> -int run_htm_reset(int optind, int argc, char *argv[]);
> -int run_htm_dump(int optind, int argc, char *argv[]);
> -int run_htm_trace(int optind, int argc, char *argv[]);
> -int run_htm_analyse(int optind, int argc, char *argv[]);
> -
>  int run_htm(int optind, int argc, char *argv[]);
> diff --git a/src/main.c b/src/main.c
> index 33e77b9..54fe80e 100644
> --- a/src/main.c
> +++ b/src/main.c
> @@ -89,13 +89,6 @@ static struct {
>  	{ "stop",    "", "Stop thread", &thread_stop },
>  	{ "threadstatus", "", "Print the status of a thread", &thread_status_print },
>  	{ "sreset",  "", "Reset", &thread_sreset },
> -	{ "htm_start", "", "[deprecated use 'htm nest start'] Start Nest HTM", &run_htm_start },
> -	{ "htm_stop", "", "[deprecated use 'htm nest stop'] Stop Nest HTM", &run_htm_stop },
> -	{ "htm_status", "", "[deprecated use 'htm nest status'] Print the status of HTM", &run_htm_status },
> -	{ "htm_reset", "", "[deprecated use 'htm nest reset'] Reset the HTM facility", &run_htm_reset },
> -	{ "htm_dump", "", "[deprecated use 'htm nest dump'] Dump HTM buffer to file", &run_htm_dump },
> -	{ "htm_trace", "" , "[deprecated use 'htm nest trace'] Configure and start tracing with HTM", &run_htm_trace },
> -	{ "htm_analyse", "", "[derepcated use 'htm nest analyse'] Stop and dump buffer to file", &run_htm_analyse },
>  	{ "htm", "(core | nest) (start | stop | status | reset | dump | trace | analyse", "Hardware Trace Macro", &run_htm },
>  	{ "probe", "", "", &handle_probe },
>  };
>