[Linux-ia64] [PATCH] control fpassist with prctl

[Jesse Barnes <jbarnes@sgi.com>]

Khalid, I sent something similar awhile back, but I haven't seen a new
release of prctl with fpassist support yet.  Here's another patch that
might be more to your liking.  Please let me know what you think.

This patch adds fpassist control to the prctl tool, which should be
useful to those that are either working on floating point applications
and/or those that don't want to be bothered with fp assist messages.

Thanks,
Jesse


diff -u prctl-1.2/prctl.c prctl-1.3/prctl.c
--- prctl-1.2/prctl.c	Mon Jun  4 17:01:41 2001
+++ prctl-1.3/prctl.c	Wed Mar 19 11:03:43 2003
@@ -3,6 +3,7 @@
  *
  * Copyright (C) 2000 Hewlett-Packard Co
  * Copyright (C) 2000 Khalid Aziz <khalid_aziz@hp.com>
+ * Copyright (C) 2003 Silicon Graphics, Inc.
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License Version 2 as 
@@ -29,7 +30,7 @@
 #include <string.h>
 
 /* Version */
-#define VERSION	"1.2"
+#define VERSION	"1.3"
 
 /* Shell to fall back on if no other shell can be found */
 #define DEFAULT_SHELL	"bash"
@@ -38,6 +39,7 @@
 
 struct option longopts[] = {
 	{"unaligned", 1, (int *)0, 'u'},
+	{"fpassist", 1, (int *)0, 'f'},
 	{"version", 0, (int *)0, 'V'},
 	{"help", 0, (int *)0, 'h'},
 	{0, 0, (int *)0, 0}
@@ -54,11 +56,14 @@
 usage(char *progname)
 {
 	print_version(progname);
-	printf("Usage: %s [-v] [-h|--help] [--version]\n", progname);
-	printf("             <-q|--unaligned=[silent|signal|default]> [command]\n");
+	printf("Usage: %s [-v] [-h|--help] [--version] <options> [command]\n",
+	       progname);
+	printf("Options:\n");
+	printf("             --unaligned=[silent|sigbus|default]\n");
+	printf("             --fpassist=[silent|sigfpe|default]\n");
 }
 
-int set_prctl(int prctl_val)
+int set_prctl_unaligned(int prctl_val)
 {
 	int alignval, retval;
 
@@ -78,7 +83,7 @@
 				break;
 
 			case PR_UNALIGN_SIGBUS:
-				printf("signal\n");
+				printf("SIGBUS\n");
 				break;
 			}
 		}
@@ -96,7 +101,7 @@
 					break;
 
 				case PR_UNALIGN_SIGBUS:
-					printf("\"signal\"\n");
+					printf("\"SIGBUS\"\n");
 					break;
 				}
 			}
@@ -109,13 +114,64 @@
 	return(retval);
 }
 
+int set_prctl_fpassist(int prctl_val)
+{
+	int assistval, retval;
+
+	/*
+	 * Check if we need to display the value or set it.
+	 */
+	if (prctl_val = -1) {
+		if ((retval = prctl(PR_GET_FPEMU, &assistval)) != -1) {
+			printf("%-12s= ", "fpassist");
+			switch (assistval) {
+			case 0:
+				printf("default\n");
+				break;
+
+			case PR_FPEMU_NOPRINT:
+				printf("silent\n");
+				break;
+
+			case PR_FPEMU_SIGFPE:
+				printf("SIGFPE\n");
+				break;
+			}
+		}
+	} else {
+		if ((retval = prctl(PR_SET_FPEMU, prctl_val)) != -1) {
+			if (verbose) {
+				printf("Set \"fpassist\" to ");
+				switch (prctl_val) {
+				case 0:
+					printf("\"default\"\n");
+					break;
+
+				case PR_FPEMU_NOPRINT:
+					printf("\"silent\"\n");
+					break;
+
+				case PR_FPEMU_SIGFPE:
+					printf("\"SIGFPE\"\n");
+					break;
+				}
+			}
+		}
+	}
+	if (retval = -1) {
+		fprintf(stderr, "Failed to %s \"fpassist\" value: %s\n",
+			((prctl_val = -1)?"get":"set"), strerror(errno));
+	}
+	return(retval);
+}
+
 int main(int argc, char **argv)
 {
 	int opt, cmd_start;
 	char *progname;
 	char fullpath[512];
 	char shellname[128];
-	int set_unaligned=-99;
+	int set_unaligned=-99, set_fpassist=-99;
 	int display = 0;
 	int display_all = 0;
 
@@ -140,7 +196,7 @@
 		case 'u':
 			if (strcmp(optarg, "silent") = 0) {
 				set_unaligned = PR_UNALIGN_NOPRINT;
-			} else if (strcmp(optarg, "signal") = 0) {
+			} else if (strcmp(optarg, "sigbus") = 0) {
 				set_unaligned = PR_UNALIGN_SIGBUS;
 			} else if (strcmp(optarg, "default") = 0) {
 				set_unaligned = 0;
@@ -153,6 +209,22 @@
 			}
 			break;
 
+		case 'f':
+			if (strcmp(optarg, "silent") = 0) {
+				set_fpassist = PR_FPEMU_NOPRINT;
+			} else if (strcmp(optarg, "sigfpe") = 0) {
+				set_fpassist = PR_FPEMU_SIGFPE;
+			} else if (strcmp(optarg, "default") = 0) {
+				set_fpassist = 0;
+			} else if (optarg[0] = 0) {
+				set_fpassist = -1;
+				display = 1;
+			} else {
+				usage(progname);
+				exit(1);
+			}
+			break;
+
 		case 'q':
 			display_all = 1;
 			display = 1;
@@ -196,16 +268,21 @@
 	 * and simply display current settings.
 	 */
 	if (display_all) {
-		set_prctl(-1);
+		set_prctl_unaligned(-1);
+		set_prctl_fpassist(-1);
 	} else {
+		int ret;
 		/*
 		 * Now set the correct prctl options if needed
 		 */
-		if (set_unaligned != -99) {
-			if (set_prctl(set_unaligned) = -1) {
-				exit(1);
-			}
-		}
+		if (set_unaligned != -99)
+			ret = set_prctl_unaligned(set_unaligned);
+		if (set_fpassist != -99)
+			ret = set_prctl_fpassist(set_fpassist);
+
+		/* Did either of them fail? */
+		if (ret = -1)
+			exit(1);
 	}
 	
 	/*