target: align switch and case statements

The coding style requires the 'case' to be at the same indentation
level of its 'switch' statement.

Align the code accordingly.

While there:
- add space around the operators;
- drop useless empty line.

Skip all riscv code, as it is going to be updated soon from the
external fork.

No changes are reported by
	git log -p -w --ignore-blank-lines --patience

Change-Id: I2691dfdd2b6734143e14160b46183623e9773539
Signed-off-by: Antonio Borneo <[email protected]>
Reviewed-on: https://review.openocd.org/c/openocd/+/9051
Tested-by: jenkins

Author: borneoa

src/target/aarch64.c

@@ -613,22 +613,22 @@ static int aarch64_restore_one(struct target *target, bool current,
 	 * kill the return address
 	 */
 	switch (arm->core_state) {
-		case ARM_STATE_ARM:
-			resume_pc &= 0xFFFFFFFC;
-			break;
-		case ARM_STATE_AARCH64:
-			resume_pc &= 0xFFFFFFFFFFFFFFFCULL;
-			break;
-		case ARM_STATE_THUMB:
-		case ARM_STATE_THUMB_EE:
-			/* When the return address is loaded into PC
-			 * bit 0 must be 1 to stay in Thumb state
-			 */
-			resume_pc |= 0x1;
-			break;
-		case ARM_STATE_JAZELLE:
-			LOG_ERROR("How do I resume into Jazelle state??");
-			return ERROR_FAIL;
+	case ARM_STATE_ARM:
+		resume_pc &= 0xFFFFFFFC;
+		break;
+	case ARM_STATE_AARCH64:
+		resume_pc &= 0xFFFFFFFFFFFFFFFCULL;
+		break;
+	case ARM_STATE_THUMB:
+	case ARM_STATE_THUMB_EE:
+		/* When the return address is loaded into PC
+		 * bit 0 must be 1 to stay in Thumb state
+		 */
+		resume_pc |= 0x1;
+		break;
+	case ARM_STATE_JAZELLE:
+		LOG_ERROR("How do I resume into Jazelle state??");
+		return ERROR_FAIL;
 	}
 	LOG_DEBUG("resume pc = 0x%016" PRIx64, resume_pc);
 	buf_set_u64(arm->pc->value, 0, 64, resume_pc);
@@ -3026,14 +3026,14 @@ COMMAND_HANDLER(aarch64_handle_disassemble_command)
 	target_addr_t address;
 
 	switch (CMD_ARGC) {
-		case 2:
-			COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], count);
-		/* FALL THROUGH */
-		case 1:
-			COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
-			break;
-		default:
-			return ERROR_COMMAND_SYNTAX_ERROR;
+	case 2:
+		COMMAND_PARSE_NUMBER(int, CMD_ARGV[1], count);
+	/* FALL THROUGH */
+	case 1:
+		COMMAND_PARSE_ADDRESS(CMD_ARGV[0], address);
+		break;
+	default:
+		return ERROR_COMMAND_SYNTAX_ERROR;
 	}
 
 	return a64_disassemble(CMD, target, address, count);

src/target/arc.c

@@ -1892,18 +1892,18 @@ static int arc_set_watchpoint(struct target *target,
 
 	int enable = AP_AC_TT_DISABLE;
 	switch (watchpoint->rw) {
-		case WPT_READ:
-			enable = AP_AC_TT_READ;
-			break;
-		case WPT_WRITE:
-			enable = AP_AC_TT_WRITE;
-			break;
-		case WPT_ACCESS:
-			enable = AP_AC_TT_READWRITE;
-			break;
-		default:
-			LOG_TARGET_ERROR(target, "BUG: watchpoint->rw neither read, write nor access");
-			return ERROR_FAIL;
+	case WPT_READ:
+		enable = AP_AC_TT_READ;
+		break;
+	case WPT_WRITE:
+		enable = AP_AC_TT_WRITE;
+		break;
+	case WPT_ACCESS:
+		enable = AP_AC_TT_READWRITE;
+		break;
+	default:
+		LOG_TARGET_ERROR(target, "BUG: watchpoint->rw neither read, write nor access");
+		return ERROR_FAIL;
 	}
 
 	int retval =  arc_configure_actionpoint(target, wp_num,

src/target/arc_cmd.c

@@ -709,29 +709,29 @@ COMMAND_HANDLER(arc_handle_get_reg_field)
 	int retval = arc_reg_get_field(target, reg_name, field_name, &value);
 
 	switch (retval) {
-		case ERROR_OK:
-			break;
-		case ERROR_ARC_REGISTER_NOT_FOUND:
-			command_print(CMD,
-				"Register `%s' has not been found.", reg_name);
-			return ERROR_COMMAND_ARGUMENT_INVALID;
-		case ERROR_ARC_REGISTER_IS_NOT_STRUCT:
-			command_print(CMD,
-				"Register `%s' must have 'struct' type.", reg_name);
-			return ERROR_COMMAND_ARGUMENT_INVALID;
-		case ERROR_ARC_REGISTER_FIELD_NOT_FOUND:
-			command_print(CMD,
-				"Field `%s' has not been found in register `%s'.",
-				field_name, reg_name);
-			return ERROR_COMMAND_ARGUMENT_INVALID;
-		case ERROR_ARC_FIELD_IS_NOT_BITFIELD:
-			command_print(CMD,
-				"Field `%s' is not a 'bitfield' field in a structure.",
-				field_name);
-			return ERROR_COMMAND_ARGUMENT_INVALID;
-		default:
-			/* Pass through other errors. */
-			return retval;
+	case ERROR_OK:
+		break;
+	case ERROR_ARC_REGISTER_NOT_FOUND:
+		command_print(CMD,
+			"Register `%s' has not been found.", reg_name);
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	case ERROR_ARC_REGISTER_IS_NOT_STRUCT:
+		command_print(CMD,
+			"Register `%s' must have 'struct' type.", reg_name);
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	case ERROR_ARC_REGISTER_FIELD_NOT_FOUND:
+		command_print(CMD,
+			"Field `%s' has not been found in register `%s'.",
+			field_name, reg_name);
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	case ERROR_ARC_FIELD_IS_NOT_BITFIELD:
+		command_print(CMD,
+			"Field `%s' is not a 'bitfield' field in a structure.",
+			field_name);
+		return ERROR_COMMAND_ARGUMENT_INVALID;
+	default:
+		/* Pass through other errors. */
+		return retval;
 	}
 
 	command_print(CMD, "0x%" PRIx32, value);