bugfix and code cleanup

git-svn-id: svn://svn.code.sf.net/p/bochs/code/trunk@12185 6c8e4198-a580-4521-a02f-c9ae86df1db9