30,32c30,32
< parser.add_option("-d", "--detailed", action="store_true")
< parser.add_option("-t", "--timing", action="store_true")
< parser.add_option("--inorder", action="store_true")
---
> parser.add_option("-c", "--cpu-type", type="choice", default="atomic",
> choices = ["atomic", "timing", "detailed", "inorder"],
> help = "type of cpu to run with")